Skip to content

console: run welcome message commands individually #19373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kurkomisi wants to merge 2 commits into from
Closed

console: run welcome message commands individually #19373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b65cd86
console: handle welcome message error
Apr 2, 2019
8d271d0
console: remove log
Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions console/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,20 +276,22 @@ func (c *Console) AutoCompleteInput(line string, pos int) (string, []string, str
func (c *Console) Welcome() {
// Print some generic Geth metadata
fmt.Fprintf(c.printer, "Welcome to the Geth JavaScript console!\n\n")
c.jsre.Run(`
console.log("instance: " + web3.version.node);
console.log("coinbase: " + eth.coinbase);
console.log("at block: " + eth.blockNumber + " (" + new Date(1000 * eth.getBlock(eth.blockNumber).timestamp) + ")");
console.log(" datadir: " + admin.datadir);
`)
for _, command := range []string{
`console.log("instance: " + web3.version.node);`,
`console.log("coinbase: " + eth.coinbase);`,
`console.log("at block: " + eth.blockNumber + " (" + new Date(1000 * eth.getBlock(eth.blockNumber).timestamp) + ")");`,
`console.log("datadir: " + admin.datadir);`,
Copy link
Copy Markdown
Member

@karalabe karalabe Apr 2, 2019

Choose a reason for hiding this comment

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

This was aligned, please revert.

} {
c.jsre.Run(command)
}
Copy link
Copy Markdown
Member

@karalabe karalabe Apr 2, 2019

Choose a reason for hiding this comment

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

I don't see a reason to run commands one-by-one, it's a programming language, lets make it work in js.

// List all the supported modules for the user to call
if apis, err := c.client.SupportedModules(); err == nil {
modules := make([]string, 0, len(apis))
for api, version := range apis {
modules = append(modules, fmt.Sprintf("%s:%s", api, version))
}
sort.Strings(modules)
fmt.Fprintln(c.printer, " modules:", strings.Join(modules, " "))
fmt.Fprintln(c.printer, "modules: ", strings.Join(modules, " "))
Copy link
Copy Markdown
Member

@karalabe karalabe Apr 2, 2019

Choose a reason for hiding this comment

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

This was aligned, please revert.

}
fmt.Fprintln(c.printer)
}
Expand Down