From 57f4e9025757254536a738bb4771712038f1e763 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <jeffrey@ethereum.org>
Date: Wed, 8 Feb 2017 13:39:26 +0100
Subject: Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"

This reverts commit 8b57c494908637a5c0e74f8f7a13b3218e026757.
---
 tests/block_test_util.go | 2 +-
 tests/state_test.go      | 2 +-
 tests/state_test_util.go | 2 +-
 tests/vm_test_util.go    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index 01539de03..470eb7cb7 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -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
 		}
diff --git a/tests/state_test.go b/tests/state_test.go
index 0b77f7276..97c4e5eeb 100644
--- a/tests/state_test.go
+++ b/tests/state_test.go
@@ -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)
 		}
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index e8ab29d14..5469a4c71 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -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
 		}
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index 1edf0e425..25e55886f 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -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
 }
-- 
cgit