From 6362a9d6102b26e926b3e73563267fc75cb30f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 29 Jun 2016 11:44:51 +0300
Subject: Revert "test, cmd/evm, core, core/vm: illegal code hash
 implementation"

This reverts commit 7a5b571c671e70e0e4807cf971c15e2d1e09d33d.
---
 core/vm/environment.go     |  3 ---
 core/vm/jit_test.go        |  9 ++++-----
 core/vm/runtime/env.go     | 26 +++++++++++---------------
 core/vm/runtime/runtime.go | 23 +++++++++++------------
 4 files changed, 26 insertions(+), 35 deletions(-)

(limited to 'core/vm')

diff --git a/core/vm/environment.go b/core/vm/environment.go
index 37817be9e..747627565 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -73,8 +73,6 @@ type Environment interface {
 	DelegateCall(me ContractRef, addr common.Address, data []byte, gas, price *big.Int) ([]byte, error)
 	// Create a new contract
 	Create(me ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error)
-	// Mark the code hash that was executed
-	MarkCodeHash(hash common.Hash)
 }
 
 // Vm is the basic interface for an implementation of the EVM.
@@ -98,7 +96,6 @@ type Database interface {
 
 	GetCode(common.Address) []byte
 	SetCode(common.Address, []byte)
-	GetCodeHash(common.Address) common.Hash
 
 	AddRefund(*big.Int)
 	GetRefund() *big.Int
diff --git a/core/vm/jit_test.go b/core/vm/jit_test.go
index a9ddd48a5..403c15a8d 100644
--- a/core/vm/jit_test.go
+++ b/core/vm/jit_test.go
@@ -175,11 +175,10 @@ func NewEnv(noJit, forceJit bool) *Env {
 	return env
 }
 
-func (self *Env) MarkCodeHash(common.Hash) {}
-func (self *Env) RuleSet() RuleSet         { return ruleSet{new(big.Int)} }
-func (self *Env) Vm() Vm                   { return self.evm }
-func (self *Env) Origin() common.Address   { return common.Address{} }
-func (self *Env) BlockNumber() *big.Int    { return big.NewInt(0) }
+func (self *Env) RuleSet() RuleSet       { return ruleSet{new(big.Int)} }
+func (self *Env) Vm() Vm                 { return self.evm }
+func (self *Env) Origin() common.Address { return common.Address{} }
+func (self *Env) BlockNumber() *big.Int  { return big.NewInt(0) }
 func (self *Env) AddStructLog(log StructLog) {
 }
 func (self *Env) StructLogs() []StructLog {
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go
index c510be759..d8c98e545 100644
--- a/core/vm/runtime/env.go
+++ b/core/vm/runtime/env.go
@@ -27,10 +27,9 @@ import (
 
 // Env is a basic runtime environment required for running the EVM.
 type Env struct {
-	ruleSet       vm.RuleSet
-	depth         int
-	state         *state.StateDB
-	illegalHashes []common.Hash
+	ruleSet vm.RuleSet
+	depth   int
+	state   *state.StateDB
 
 	origin   common.Address
 	coinbase common.Address
@@ -50,15 +49,14 @@ type Env struct {
 // NewEnv returns a new vm.Environment
 func NewEnv(cfg *Config, state *state.StateDB) vm.Environment {
 	env := &Env{
-		ruleSet:       cfg.RuleSet,
-		illegalHashes: cfg.illegalHashes,
-		state:         state,
-		origin:        cfg.Origin,
-		coinbase:      cfg.Coinbase,
-		number:        cfg.BlockNumber,
-		time:          cfg.Time,
-		difficulty:    cfg.Difficulty,
-		gasLimit:      cfg.GasLimit,
+		ruleSet:    cfg.RuleSet,
+		state:      state,
+		origin:     cfg.Origin,
+		coinbase:   cfg.Coinbase,
+		number:     cfg.BlockNumber,
+		time:       cfg.Time,
+		difficulty: cfg.Difficulty,
+		gasLimit:   cfg.GasLimit,
 	}
 	env.evm = vm.New(env, vm.Config{
 		Debug:     cfg.Debug,
@@ -81,8 +79,6 @@ func (self *Env) AddStructLog(log vm.StructLog) {
 	self.logs = append(self.logs, log)
 }
 
-func (self *Env) MarkCodeHash(hash common.Hash) {}
-
 func (self *Env) RuleSet() vm.RuleSet      { return self.ruleSet }
 func (self *Env) Vm() vm.Vm                { return self.evm }
 func (self *Env) Origin() common.Address   { return self.origin }
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index 9b75fcaad..309d508c3 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -35,18 +35,17 @@ func (ruleSet) IsHomestead(*big.Int) bool { return true }
 // Config is a basic type specifying certain configuration flags for running
 // the EVM.
 type Config struct {
-	RuleSet       vm.RuleSet
-	Difficulty    *big.Int
-	Origin        common.Address
-	Coinbase      common.Address
-	BlockNumber   *big.Int
-	Time          *big.Int
-	GasLimit      *big.Int
-	GasPrice      *big.Int
-	Value         *big.Int
-	DisableJit    bool // "disable" so it's enabled by default
-	Debug         bool
-	illegalHashes []common.Hash
+	RuleSet     vm.RuleSet
+	Difficulty  *big.Int
+	Origin      common.Address
+	Coinbase    common.Address
+	BlockNumber *big.Int
+	Time        *big.Int
+	GasLimit    *big.Int
+	GasPrice    *big.Int
+	Value       *big.Int
+	DisableJit  bool // "disable" so it's enabled by default
+	Debug       bool
 
 	State     *state.StateDB
 	GetHashFn func(n uint64) common.Hash
-- 
cgit v1.2.3