diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-24 01:30:11 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-24 01:30:11 +0800 |
| commit | f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4 (patch) | |
| tree | ee4f85745fc5f863464453edbd47d90d107efd16 /cmd | |
| parent | c8e9ca048327d7074cfd58137ebf89e065763b71 (diff) | |
| parent | 90c710fd2687a0c9f3b3e4f5f3b9b69febc506e8 (diff) | |
| download | go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.tar go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.tar.gz go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.tar.bz2 go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.tar.lz go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.tar.xz go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.tar.zst go-tangerine-f2f65c1a65d39a31fa0c6ed574fb2a6e213de5d4.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/js.go | 1 | ||||
| -rw-r--r-- | cmd/ethtest/main.go | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/ethereum/js.go b/cmd/ethereum/js.go index 88d16d6a8..6f0ac526f 100644 --- a/cmd/ethereum/js.go +++ b/cmd/ethereum/js.go @@ -91,6 +91,7 @@ func newJSRE(ethereum *eth.Ethereum, libPath string) *jsre { func (js *jsre) apiBindings() { ethApi := rpc.NewEthereumApi(js.xeth, js.ethereum.DataDir) + ethApi.Close() //js.re.Bind("jeth", rpc.NewJeth(ethApi, js.re.ToVal)) jeth := rpc.NewJeth(ethApi, js.re.ToVal, js.re) diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index f5b423e8d..952ba1bd6 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -33,12 +33,12 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/tests/helper" - "github.com/ethereum/go-ethereum/core/vm" ) type Log struct { @@ -80,8 +80,7 @@ func StateObjectFromAccount(db common.Database, addr string, account Account) *s } type VmTest struct { - Callcreates interface{} - //Env map[string]string + Callcreates interface{} Env Env Exec map[string]string Transaction map[string]string @@ -219,7 +218,7 @@ func RunVmTest(r io.Reader) (failed int) { } func main() { - //helper.Logger.SetLogLevel(5) + helper.Logger.SetLogLevel(5) vm.Debug = true if len(os.Args) > 1 { |