From 9cacec70f9af77aaf9bf7f48b90f16ebc6d36298 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Tue, 11 Aug 2015 00:27:30 +0200
Subject: cmd/evm, core/vm, tests: changed DisableVm to EnableVm

---
 core/block_processor.go | 12 +-----------
 core/vm/jit_test.go     |  2 +-
 core/vm/settings.go     |  6 +++---
 core/vm/vm.go           |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'core')

diff --git a/core/block_processor.go b/core/block_processor.go
index 477215356..829e4314c 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -354,18 +354,8 @@ func (sm *BlockProcessor) GetLogs(block *types.Block) (logs state.Logs, err erro
 		for _, receipt := range receipts {
 			logs = append(logs, receipt.Logs()...)
 		}
-		return
 	}
-
-	// TODO: remove backward compatibility
-	var (
-		parent = sm.bc.GetBlock(block.ParentHash())
-		state  = state.New(parent.Root(), sm.chainDb)
-	)
-
-	sm.TransitionState(state, parent, block, true)
-
-	return state.Logs(), nil
+	return logs, nil
 }
 
 // See YP section 4.3.4. "Block Header Validity"
diff --git a/core/vm/jit_test.go b/core/vm/jit_test.go
index 5b3feea99..b9e2c6999 100644
--- a/core/vm/jit_test.go
+++ b/core/vm/jit_test.go
@@ -46,7 +46,7 @@ func runVmBench(test vmBench, b *testing.B) {
 	}
 	env := NewEnv()
 
-	DisableJit = test.nojit
+	EnableJit = !test.nojit
 	ForceJit = test.forcejit
 
 	b.ResetTimer()
diff --git a/core/vm/settings.go b/core/vm/settings.go
index 0cd931b6a..f9296f6c8 100644
--- a/core/vm/settings.go
+++ b/core/vm/settings.go
@@ -17,9 +17,9 @@
 package vm
 
 var (
-	DisableJit  bool = true // Disable the JIT VM
-	ForceJit    bool        // Force the JIT, skip byte VM
-	MaxProgSize int         // Max cache size for JIT Programs
+	EnableJit   bool // Enables the JIT VM
+	ForceJit    bool // Force the JIT, skip byte VM
+	MaxProgSize int  // Max cache size for JIT Programs
 )
 
 const defaultJitMaxCache int = 64
diff --git a/core/vm/vm.go b/core/vm/vm.go
index c292b45d1..da764004a 100644
--- a/core/vm/vm.go
+++ b/core/vm/vm.go
@@ -64,7 +64,7 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
 		codehash = crypto.Sha3Hash(context.Code) // codehash is used when doing jump dest caching
 		program  *Program
 	)
-	if !DisableJit {
+	if EnableJit {
 		// Fetch program status.
 		// * If ready run using JIT
 		// * If unknown, compile in a seperate goroutine
-- 
cgit v1.2.3