Merge branch origin/develop into accounts-integration
Conflicts: cmd/blocktest/main.go cmd/mist/debugger.go cmd/utils/cmd.go
This commit is contained in:
		| @@ -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 { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user