浏览代码

fixed tests

obscuren 10 年之前
父节点
当前提交
9de1ad6546
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 4 4
      cmd/evm/main.go
  2. 1 1
      core/chain_manager.go

+ 4 - 4
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)
 }

+ 1 - 1
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) {