Skip to content

cmd/puppeth: new version as presented at devcon3#15390

Merged
karalabe merged 15 commits into
ethereum:masterfrom
karalabe:puppeth-devcon3
Nov 24, 2017
Merged

cmd/puppeth: new version as presented at devcon3#15390
karalabe merged 15 commits into
ethereum:masterfrom
karalabe:puppeth-devcon3

Conversation

@karalabe
Copy link
Copy Markdown
Member

@karalabe karalabe commented Oct 27, 2017

Ideal to have before merging:

  • Containerize geth-alltools to have a reliable faucet source without needing an external repo (puppeth/go-ethereum).
  • Check and fix and issues with web deployments without a reverse-proxy.

@fjl fjl added this to the 1.8.0 milestone Nov 13, 2017
Copy link
Copy Markdown
Member

@gballet gballet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my limited perspective, it looks good to me. I would rely more on external templates and try to reduce code duplication. Cool tool though, glad I looked at the devcon pressentation!

)

// explorerDockerfile is the Dockerfile required to run a block explorer.
var explorerDockerfile = `
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that you have a lot of these files embedded into go files. How about using something like Ego ? https://github.com/benbjohnson/ego

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did consider using external file templates and perhaps embedding them with go generate and go-bindata. But truth be told these are fairly small files, so it's less of a hassle to just keep them embedded directly and have a single place to edit and debug them.

Comment thread cmd/puppeth/module_node.go Outdated
// String implements the stringer interface.
func (info *nodeInfos) String() string {
discv5 := ""
// Report converts the typed struct into a plain string->string map, cotnaining
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: "cotnaining"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, fixed all occurrences.

Comment thread cmd/puppeth/wizard_faucet.go Outdated
minutes: 1440,
tiers: 3,
}
existed = false
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so basically

existed := err == nil

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, much cleaner, fixed all occurrences.

@karalabe
Copy link
Copy Markdown
Member Author

@gballet Thanks for the review! PTAL :)

Copy link
Copy Markdown
Member

@gballet gballet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@karalabe karalabe merged commit f9569f3 into ethereum:master Nov 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants