diff options
author | Felix Lange <fjl@twurst.com> | 2015-03-11 00:14:31 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2015-03-11 00:14:31 +0800 |
commit | 269cfbb8ace76ddc1f50dbd5b218c499308c8a5c (patch) | |
tree | c2e9e274c64f431f03b9a6b8b3de22585c016027 /tests | |
parent | 972e2c1e31067a9bab77228c19348b66964ce643 (diff) | |
parent | 0542df941f57a75fa7b699089db1d9ae40e4ff71 (diff) | |
download | dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.gz dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.zst dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.zip |
Merge branch origin/develop into accounts-integration
Conflicts:
cmd/blocktest/main.go
cmd/mist/debugger.go
cmd/utils/cmd.go
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vm/gh_test.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 2db7a0fd0..959f20463 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -80,13 +80,6 @@ func RunVmTest(p string, t *testing.T) { helper.CreateFileTests(t, p, &tests) for name, test := range tests { - /* - vm.Debug = true - helper.Logger.SetLogLevel(4) - if name != "refund_CallToSuicideTwice" { - continue - } - */ db, _ := ethdb.NewMemDatabase() statedb := state.New(nil, db) for addr, account := range test.Pre { |