diff options
author | obscuren <geffobscura@gmail.com> | 2015-01-13 17:30:52 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-01-13 17:30:52 +0800 |
commit | 4704a0a288af89795e251db98eb253de117ff031 (patch) | |
tree | d6e975352b20a3c23a6af453c45b87b1e2d976ae /tests | |
parent | 5b561f434d888b750bb9b29726a86d664ac89660 (diff) | |
download | dexon-4704a0a288af89795e251db98eb253de117ff031.tar dexon-4704a0a288af89795e251db98eb253de117ff031.tar.gz dexon-4704a0a288af89795e251db98eb253de117ff031.tar.bz2 dexon-4704a0a288af89795e251db98eb253de117ff031.tar.lz dexon-4704a0a288af89795e251db98eb253de117ff031.tar.xz dexon-4704a0a288af89795e251db98eb253de117ff031.tar.zst dexon-4704a0a288af89795e251db98eb253de117ff031.zip |
remove pre compiled for tests
Diffstat (limited to 'tests')
-rw-r--r-- | tests/helper/vm.go | 5 | ||||
-rw-r--r-- | tests/vm/gh_test.go | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/helper/vm.go b/tests/helper/vm.go index 2f3ec30f7..7c33839cf 100644 --- a/tests/helper/vm.go +++ b/tests/helper/vm.go @@ -116,6 +116,8 @@ func RunVm(state *state.StateDB, env, exec map[string]string) ([]byte, state.Log price = ethutil.Big(exec["gasPrice"]) value = ethutil.Big(exec["value"]) ) + // Reset the pre-compiled contracts for VM tests. + vm.Precompiled = make(map[string]*vm.PrecompiledAccount) caller := state.GetOrNewStateObject(from) @@ -138,6 +140,9 @@ func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state. caddr = FromHex(env["currentCoinbase"]) ) + // Set pre compiled contracts + vm.Precompiled = vm.PrecompiledContracts() + coinbase := statedb.GetOrNewStateObject(caddr) coinbase.SetGasPool(ethutil.Big(env["currentGasLimit"])) diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 699225e90..7b41411de 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -79,6 +79,7 @@ func RunVmTest(p string, t *testing.T) { helper.CreateFileTests(t, p, &tests) for name, test := range tests { + //helper.Log.Infoln("Running", name) db, _ := ethdb.NewMemDatabase() statedb := state.New(nil, db) for addr, account := range test.Pre { @@ -116,12 +117,6 @@ func RunVmTest(p string, t *testing.T) { ret, logs, gas, err = helper.RunState(statedb, env, test.Transaction) } - // Log the error if there is one. Error does not mean failing test. - // A test fails if err != nil and post params are specified in the test. - if err != nil { - helper.Log.Infof("%s's: %v\n", name, err) - } - rexp := helper.FromHex(test.Out) if bytes.Compare(rexp, ret) != 0 { t.Errorf("%s's return failed. Expected %x, got %x\n", name, rexp, ret) @@ -129,10 +124,14 @@ func RunVmTest(p string, t *testing.T) { if isVmTest { if len(test.Gas) == 0 && err == nil { + // Log VM err + helper.Log.Infof("%s's: %v\n", name, err) t.Errorf("%s's gas unspecified, indicating an error. VM returned (incorrectly) successfull", name) } else { gexp := ethutil.Big(test.Gas) if gexp.Cmp(gas) != 0 { + // Log VM err + helper.Log.Infof("%s's: %v\n", name, err) t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas) } } |