diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/admin.go | 12 | ||||
| -rw-r--r-- | cmd/ethereum/js_test.go | 42 |
2 files changed, 8 insertions, 46 deletions
diff --git a/cmd/ethereum/admin.go b/cmd/ethereum/admin.go index 2f95bc3cb..880a22c22 100644 --- a/cmd/ethereum/admin.go +++ b/cmd/ethereum/admin.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/state" @@ -121,11 +121,11 @@ func (js *jsre) unlock(call otto.FunctionCall) otto.Value { } } am := js.ethereum.AccountManager() - // err := am.Unlock(ethutil.FromHex(split[0]), split[1]) + // err := am.Unlock(common.FromHex(split[0]), split[1]) // if err != nil { // utils.Fatalf("Unlock account failed '%v'", err) // } - err = am.TimedUnlock(ethutil.FromHex(addr), passphrase, time.Duration(seconds)*time.Second) + err = am.TimedUnlock(common.FromHex(addr), passphrase, time.Duration(seconds)*time.Second) if err != nil { fmt.Printf("Unlock account failed '%v'\n", err) return otto.FalseValue() @@ -164,7 +164,7 @@ func (js *jsre) newAccount(call otto.FunctionCall) otto.Value { fmt.Printf("Could not create the account: %v", err) return otto.UndefinedValue() } - return js.re.ToVal(ethutil.Bytes2Hex(acct.Address)) + return js.re.ToVal(common.Bytes2Hex(acct.Address)) } func (js *jsre) nodeInfo(call otto.FunctionCall) otto.Value { @@ -223,7 +223,7 @@ func (js *jsre) exportChain(call otto.FunctionCall) otto.Value { } data := js.ethereum.ChainManager().Export() - if err := ethutil.WriteFile(fn, data); err != nil { + if err := common.WriteFile(fn, data); err != nil { fmt.Println(err) return otto.FalseValue() } @@ -239,7 +239,7 @@ func (js *jsre) dumpBlock(call otto.FunctionCall) otto.Value { block = js.ethereum.ChainManager().GetBlockByNumber(uint64(num)) } else if call.Argument(0).IsString() { hash, _ := call.Argument(0).ToString() - block = js.ethereum.ChainManager().GetBlock(ethutil.Hex2Bytes(hash)) + block = js.ethereum.ChainManager().GetBlock(common.Hex2Bytes(hash)) } else { fmt.Println("invalid argument for dump. Either hex string or number") } diff --git a/cmd/ethereum/js_test.go b/cmd/ethereum/js_test.go index 132101912..0d3c22553 100644 --- a/cmd/ethereum/js_test.go +++ b/cmd/ethereum/js_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/ethereum/go-ethereum/accounts" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethutil" ) var port = 30300 @@ -29,7 +29,7 @@ func testJEthRE(t *testing.T) (repl *jsre, ethereum *eth.Ethereum, err error) { } // FIXME: this does not work ATM ks := crypto.NewKeyStorePlain("/tmp/eth/keys") - ethutil.WriteFile("/tmp/eth/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/e273f01c99144c438695e10f24926dc1f9fbf62d", + common.WriteFile("/tmp/eth/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/e273f01c99144c438695e10f24926dc1f9fbf62d", []byte(`{"Id":"RhRXD+fNRKS4jx+7ZfEsNA==","Address":"4nPwHJkUTEOGleEPJJJtwfn79i0=","PrivateKey":"h4ACVpe74uIvi5Cg/2tX/Yrm2xdr3J7QoMbMtNX2CNc="}`)) port++ @@ -226,44 +226,6 @@ func TestMining(t *testing.T) { t.Errorf("expected false (not mining), got true") } - val, err = repl.re.Run("admin.startMining(4)") - if err != nil { - t.Errorf("expected no error, got %v", err) - } - mining, _ = val.ToBoolean() - if !mining { - t.Errorf("expected true (mining), got false") - } - val, err = repl.re.Run("eth.mining") - if err != nil { - t.Errorf("expected no error, got %v", err) - } - mining, err = val.ToBoolean() - if err != nil { - t.Errorf("expected boolean, got %v", err) - } - if !mining { - t.Errorf("expected true (mining), got false") - } - - val, err = repl.re.Run("admin.startMining(4)") - if err != nil { - t.Errorf("expected no error, got %v", err) - } - mining, _ = val.ToBoolean() - if !mining { - t.Errorf("expected true (mining), got false") - } - - val, err = repl.re.Run("admin.stopMining()") - if err != nil { - t.Errorf("expected no error, got %v", err) - } - mining, _ = val.ToBoolean() - if !mining { - t.Errorf("expected true (mining), got false") - } - } func TestRPC(t *testing.T) { |