diff options
| author | zelig <viktor.tron@gmail.com> | 2015-06-22 03:33:51 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-07-03 06:28:12 +0800 |
| commit | eb82ca4563cf80bef9b520673d3bd18283da3a1f (patch) | |
| tree | 068b631c9d78ce6671206a77c1ad484fd190d4d5 | |
| parent | 09b69831758cb1001027fbb59dff9b3fbe20bbb2 (diff) | |
| download | dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.tar dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.tar.gz dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.tar.bz2 dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.tar.lz dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.tar.xz dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.tar.zst dexon-eb82ca4563cf80bef9b520673d3bd18283da3a1f.zip | |
rpc/js coinbase returns null if no etherbase set
| -rw-r--r-- | cmd/geth/js_test.go | 4 | ||||
| -rw-r--r-- | xeth/xeth.go | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index fc2444a7b..5bdfb7048 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -140,7 +140,7 @@ func TestAccounts(t *testing.T) { defer os.RemoveAll(tmp) checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`"]`) - checkEvalJSON(t, repl, `eth.coinbase`, `"`+common.Address{}.Hex()+`"`) + checkEvalJSON(t, repl, `eth.coinbase`, `null`) val, err := repl.re.Run(`personal.newAccount("password")`) if err != nil { @@ -151,9 +151,7 @@ func TestAccounts(t *testing.T) { t.Errorf("address not hex: %q", addr) } - // skip until order fixed #824 // checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`", "`+addr+`"]`) - // checkEvalJSON(t, repl, `eth.coinbase`, `"`+testAddress+`"`) } func TestBlockChain(t *testing.T) { diff --git a/xeth/xeth.go b/xeth/xeth.go index 2a1366fe1..84d58a49f 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -477,7 +477,10 @@ func (self *XEth) IsListening() bool { } func (self *XEth) Coinbase() string { - eb, _ := self.backend.Etherbase() + eb, err := self.backend.Etherbase() + if err != nil { + return "0x0" + } return eb.Hex() } |