cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

console: remove unnecessary JS evaluation in Welcome

Browse Source
This commit is contained in:
Felix Lange 2016-06-02 22:33:11 +02:00
parent fdba0cb03c
commit ad0e6e971e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
console/console.go
View File

@ -244,14 +244,12 @@ func (c *Console) AutoCompleteInput(line string, pos int) (string, []string, str
// console's available modules. // console's available modules.
func (c *Console) Welcome() { func (c *Console) Welcome() {
// Print some generic Geth metadata // Print some generic Geth metadata
fmt.Fprintf(c.printer, "Welcome to the Geth JavaScript console!\n\n")
c.jsre.Run(` c.jsre.Run(`
(function () {
console.log("Welcome to the Geth JavaScript console!\n");
console.log("instance: " + web3.version.node); console.log("instance: " + web3.version.node);
console.log("coinbase: " + eth.coinbase); console.log("coinbase: " + eth.coinbase);
console.log("at block: " + eth.blockNumber + " (" + new Date(1000 * eth.getBlock(eth.blockNumber).timestamp) + ")"); console.log("at block: " + eth.blockNumber + " (" + new Date(1000 * eth.getBlock(eth.blockNumber).timestamp) + ")");
console.log(" datadir: " + admin.datadir); console.log(" datadir: " + admin.datadir);
})();
`) `)
// List all the supported modules for the user to call // List all the supported modules for the user to call
if apis, err := c.client.SupportedModules(); err == nil { if apis, err := c.client.SupportedModules(); err == nil {
@ -260,9 +258,9 @@ func (c *Console) Welcome() {
modules = append(modules, fmt.Sprintf("%s:%s", api, version)) modules = append(modules, fmt.Sprintf("%s:%s", api, version))
} }
sort.Strings(modules) sort.Strings(modules)
c.jsre.Run("(function () { console.log(' modules: " + strings.Join(modules, " ") + "'); })();") fmt.Fprintln(c.printer, " modules:", strings.Join(modules, " "))
} }
c.jsre.Run("(function () { console.log(); })();") fmt.Fprintln(c.printer)
} }
// Evaluate executes code and pretty prints the result to the specified output // Evaluate executes code and pretty prints the result to the specified output