aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-24 22:27:05 +0800
committerobscuren <geffobscura@gmail.com>2015-03-24 22:27:05 +0800
commit9de1ad65460898ab79c02ce076f1a2b0a7144656 (patch)
tree60cfbd81d5974fbab2f905749db70ddde4034ea3
parentff9d66e096e853883c269b41cc94b17d4bc95261 (diff)
downloaddexon-9de1ad65460898ab79c02ce076f1a2b0a7144656.tar.gz
dexon-9de1ad65460898ab79c02ce076f1a2b0a7144656.tar.zst
dexon-9de1ad65460898ab79c02ce076f1a2b0a7144656.zip
fixed tests
-rw-r--r--cmd/evm/main.go8
-rw-r--r--core/chain_manager.go2
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 76e34e21d..4c6059794 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -32,11 +32,11 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger"
- "github.com/ethereum/go-ethereum/core/state"
- "github.com/ethereum/go-ethereum/core/vm"
)
var (
@@ -157,7 +157,7 @@ func (self *VMEnv) CallCode(caller vm.ContextRef, addr common.Address, data []by
return exe.Call(addr, caller)
}
-func (self *VMEnv) Create(caller vm.ContextRef, addr *common.Address, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
- exe := self.vm(addr, data, gas, price, value)
+func (self *VMEnv) Create(caller vm.ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
+ exe := self.vm(nil, data, gas, price, value)
return exe.Create(caller)
}
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 6e8f7b4fe..f0d3fd4cf 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -399,7 +399,7 @@ func (self *ChainManager) GetAncestors(block *types.Block, length int) (blocks [
func (bc *ChainManager) setTotalDifficulty(td *big.Int) {
bc.blockDb.Put([]byte("LTD"), td.Bytes())
- bc.td.Set(td)
+ bc.td = td
}
func (self *ChainManager) CalcTotalDiff(block *types.Block) (*big.Int, error) {