aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-04 18:40:20 +0800
committerobscuren <geffobscura@gmail.com>2014-12-04 18:40:20 +0800
commitf298ffdbb8ec2b14f254e880a65f22f4d7c66305 (patch)
tree59b0edc06529785afef7c103e9bdbd4248ec58da /xeth
parent3664cd58e3631fccf4d9aba1932e0bb63ad442a6 (diff)
downloaddexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar
dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.gz
dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.bz2
dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.lz
dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.xz
dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.zst
dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.zip
Renamed State => StateDB
Diffstat (limited to 'xeth')
-rw-r--r--xeth/js_types.go2
-rw-r--r--xeth/pipe.go2
-rw-r--r--xeth/vm_env.go6
-rw-r--r--xeth/world.go2
4 files changed, 6 insertions, 6 deletions
diff --git a/xeth/js_types.go b/xeth/js_types.go
index 6aba3d993..da26439cf 100644
--- a/xeth/js_types.go
+++ b/xeth/js_types.go
@@ -95,7 +95,7 @@ type JSTransaction struct {
Confirmations int `json:"confirmations"`
}
-func NewJSTx(tx *types.Transaction, state *state.State) *JSTransaction {
+func NewJSTx(tx *types.Transaction, state *state.StateDB) *JSTransaction {
hash := ethutil.Bytes2Hex(tx.Hash())
receiver := ethutil.Bytes2Hex(tx.Recipient)
if receiver == "0000000000000000000000000000000000000000" {
diff --git a/xeth/pipe.go b/xeth/pipe.go
index f1ecd19d5..6da92cd23 100644
--- a/xeth/pipe.go
+++ b/xeth/pipe.go
@@ -16,7 +16,7 @@ import (
var pipelogger = logger.NewLogger("XETH")
type VmVars struct {
- State *state.State
+ State *state.StateDB
}
type XEth struct {
diff --git a/xeth/vm_env.go b/xeth/vm_env.go
index 831a310cc..4a2827ff4 100644
--- a/xeth/vm_env.go
+++ b/xeth/vm_env.go
@@ -10,7 +10,7 @@ import (
)
type VMEnv struct {
- state *state.State
+ state *state.StateDB
block *types.Block
value *big.Int
sender []byte
@@ -18,7 +18,7 @@ type VMEnv struct {
depth int
}
-func NewEnv(state *state.State, block *types.Block, value *big.Int, sender []byte) *VMEnv {
+func NewEnv(state *state.StateDB, block *types.Block, value *big.Int, sender []byte) *VMEnv {
return &VMEnv{
state: state,
block: block,
@@ -35,7 +35,7 @@ func (self *VMEnv) Time() int64 { return self.block.Time }
func (self *VMEnv) Difficulty() *big.Int { return self.block.Difficulty }
func (self *VMEnv) BlockHash() []byte { return self.block.Hash() }
func (self *VMEnv) Value() *big.Int { return self.value }
-func (self *VMEnv) State() *state.State { return self.state }
+func (self *VMEnv) State() *state.StateDB { return self.state }
func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit }
func (self *VMEnv) Depth() int { return self.depth }
func (self *VMEnv) SetDepth(i int) { self.depth = i }
diff --git a/xeth/world.go b/xeth/world.go
index 6fb757d67..c5c20c224 100644
--- a/xeth/world.go
+++ b/xeth/world.go
@@ -22,7 +22,7 @@ func (self *XEth) World() *World {
return self.world
}
-func (self *World) State() *state.State {
+func (self *World) State() *state.StateDB {
return self.pipe.blockManager.CurrentState()
}