From 7c1130c2375bf14f4d8d77c5025ebef14367a8e9 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Wed, 18 May 2016 13:35:43 -0400 Subject: [PATCH] Merge continue 4 cleaned up a few Eth stragglers --- common/defaults.go | 10 +++++----- jsre/expanse_js.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/defaults.go b/common/defaults.go index 913fe8bf93..5e89491e26 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -24,9 +24,9 @@ import ( const ( DefaultIPCSocket = "gexp.ipc" // Default (relative) name of the IPC RPC socket DefaultHTTPHost = "localhost" // Default host interface for the HTTP RPC server - DefaultHTTPPort = 8545 // Default TCP port for the HTTP RPC server + DefaultHTTPPort = 9659 // Default TCP port for the HTTP RPC server DefaultWSHost = "localhost" // Default host interface for the websocket RPC server - DefaultWSPort = 8546 // Default TCP port for the websocket RPC server + DefaultWSPort = 9656 // Default TCP port for the websocket RPC server ) // DefaultDataDir is the default data directory to use for the databases and other @@ -36,11 +36,11 @@ func DefaultDataDir() string { home := HomeDir() if home != "" { if runtime.GOOS == "darwin" { - return filepath.Join(home, "Library", "Ethereum") + return filepath.Join(home, "Library", "Expanse") } else if runtime.GOOS == "windows" { - return filepath.Join(home, "AppData", "Roaming", "Ethereum") + return filepath.Join(home, "AppData", "Roaming", "Expanse") } else { - return filepath.Join(home, ".ethereum") + return filepath.Join(home, ".expanse") } } // As we cannot guess a stable location, return empty and handle later diff --git a/jsre/expanse_js.go b/jsre/expanse_js.go index 41885cd878..c6fa8a7b95 100644 --- a/jsre/expanse_js.go +++ b/jsre/expanse_js.go @@ -2617,7 +2617,7 @@ var properties = function () { inputFormatter: utils.toDecimal }), new Property({ - name: 'version.ethereum', + name: 'version.expanse', getter: 'eth_protocolVersion', inputFormatter: utils.toDecimal }), @@ -5440,7 +5440,7 @@ Exp.prototype.isSyncing = function (callback) { return new IsSyncing(this._requestManager, callback); }; -module.exports = Eth; +module.exports = Exp; },{"../../utils/config":18,"../../utils/utils":20,"../contract":25,"../filter":29,"../formatters":30,"../iban":33,"../method":36,"../namereg":43,"../property":44,"../syncing":47,"../transfer":48,"./watches":42}],39:[function(require,module,exports){