aboutsummaryrefslogtreecommitdiffstats
path: root/console
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-06-03 04:33:11 +0800
committerFelix Lange <fjl@twurst.com>2016-06-03 17:08:55 +0800
commitad0e6e971e7d03c07842cc236fec09c73f93f465 (patch)
tree94b44921566cd68a74721422dc26ae6b2ab819cd /console
parentfdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e (diff)
downloaddexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.tar
dexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.tar.gz
dexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.tar.bz2
dexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.tar.lz
dexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.tar.xz
dexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.tar.zst
dexon-ad0e6e971e7d03c07842cc236fec09c73f93f465.zip
console: remove unnecessary JS evaluation in Welcome
Diffstat (limited to 'console')
-rw-r--r--console/console.go18
1 files changed, 8 insertions, 10 deletions
diff --git a/console/console.go b/console/console.go
index a19b267bc..baa9cf545 100644
--- a/console/console.go
+++ b/console/console.go
@@ -244,15 +244,13 @@ func (c *Console) AutoCompleteInput(line string, pos int) (string, []string, str
// console's available modules.
func (c *Console) Welcome() {
// Print some generic Geth metadata
+ fmt.Fprintf(c.printer, "Welcome to the Geth JavaScript console!\n\n")
c.jsre.Run(`
- (function () {
- console.log("Welcome to the Geth JavaScript console!\n");
- 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);
- })();
- `)
+ 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);
+ `)
// List all the supported modules for the user to call
if apis, err := c.client.SupportedModules(); err == nil {
modules := make([]string, 0, len(apis))
@@ -260,9 +258,9 @@ func (c *Console) Welcome() {
modules = append(modules, fmt.Sprintf("%s:%s", api, version))
}
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