forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge continue 4

Browse source 
cleaned up a few Eth stragglers
This commit is contained in:
Christopher Franko 2016-05-18 13:35:43 -04:00
parent 46b10efca0
commit 7c1130c237
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/defaults.go
View file

@ -24,9 +24,9 @@ import (
const ( const (
DefaultIPCSocket = "gexp.ipc" // Default (relative) name of the IPC RPC socket DefaultIPCSocket = "gexp.ipc" // Default (relative) name of the IPC RPC socket
DefaultHTTPHost = "localhost" // Default host interface for the HTTP RPC server 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 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 // DefaultDataDir is the default data directory to use for the databases and other
@ -36,11 +36,11 @@ func DefaultDataDir() string {
home := HomeDir() home := HomeDir()
if home != "" { if home != "" {
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
return filepath.Join(home, "Library", "Ethereum") return filepath.Join(home, "Library", "Expanse")
} else if runtime.GOOS == "windows" { } else if runtime.GOOS == "windows" {
return filepath.Join(home, "AppData", "Roaming", "Ethereum") return filepath.Join(home, "AppData", "Roaming", "Expanse")
} else { } else {
return filepath.Join(home, ".ethereum") return filepath.Join(home, ".expanse")
} }
} }
// As we cannot guess a stable location, return empty and handle later // As we cannot guess a stable location, return empty and handle later

4
jsre/expanse_js.go
View file

@ -2617,7 +2617,7 @@ var properties = function () {
inputFormatter: utils.toDecimal inputFormatter: utils.toDecimal
}), }),
new Property({ new Property({
name: 'version.ethereum', name: 'version.expanse',
getter: 'eth_protocolVersion', getter: 'eth_protocolVersion',
inputFormatter: utils.toDecimal inputFormatter: utils.toDecimal
}), }),
@ -5440,7 +5440,7 @@ Exp.prototype.isSyncing = function (callback) {
return new IsSyncing(this._requestManager, 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){ },{"../../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){