gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"

Browse Source 
This reverts commit 8b57c49490.
This commit is contained in:
Jeffrey Wilcke
2017-02-08 13:39:26 +01:00
parent f8f428cc18
commit 57f4e90257
49 changed files with 1118 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/block_test_util.go
View File

@ -146,7 +146,7 @@ func runBlockTests(homesteadBlock, daoForkBlock, gasPriceFork *big.Int, bt map[s
}
for name, test := range bt {
if skipTest[name] /*|| name != "CallingCanonicalContractFromFork_CALLCODE"*/ {
if skipTest[name] {
glog.Infoln("Skipping block test", name)
continue
}

2
tests/state_test.go
View File

@ -237,13 +237,13 @@ func TestWallet(t *testing.T) {
}
func TestStateTestsRandom(t *testing.T) {
t.Skip()
chainConfig := &params.ChainConfig{
HomesteadBlock: big.NewInt(1150000),
}
fns, _ := filepath.Glob("./files/StateTests/RandomTests/*")
for _, fn := range fns {
t.Log("running:", fn)
if err := RunStateTest(chainConfig, fn, StateSkipTests); err != nil {
t.Error(fn, err)
}

2
tests/state_test_util.go
View File

@ -108,7 +108,7 @@ func runStateTests(chainConfig *params.ChainConfig, tests map[string]VmTest, ski
}
for name, test := range tests {
if skipTest[name] /*|| name != "JUMPDEST_Attack"*/ {
if skipTest[name] {
glog.Infoln("Skipping state test", name)
continue
}

6
tests/vm_test_util.go
View File

@ -129,7 +129,7 @@ func runVmTests(tests map[string]VmTest, skipTests []string) error {
}
for name, test := range tests {
if skipTest[name] /*|| name != "exp0"*/ {
if skipTest[name] /*|| name != "loop_stacklimit_1021"*/ {
glog.Infoln("Skipping VM test", name)
continue
}
@ -229,6 +229,6 @@ func RunVm(statedb *state.StateDB, env, exec map[string]string) ([]byte, []*type
vm.PrecompiledContracts = make(map[common.Address]vm.PrecompiledContract)
environment, _ := NewEVMEnvironment(true, chainConfig, statedb, env, exec)
ret, g, err := environment.Call(caller, to, data, gas.Uint64(), value)
return ret, statedb.Logs(), new(big.Int).SetUint64(g), err
ret, err := environment.Call(caller, to, data, gas, value)
return ret, statedb.Logs(), gas, err
}