diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-04 17:57:02 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-04 17:57:02 +0800 |
| commit | f59a3b67f69b26f969084e0de165435e80bd8e12 (patch) | |
| tree | f92098fa0252484fcdccdaf6075c2842713a2fc9 /xeth | |
| parent | 1025d097fd4e5171dadb2c1a8eeb43b7730b13b6 (diff) | |
| download | go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.tar go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.tar.gz go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.tar.bz2 go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.tar.lz go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.tar.xz go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.tar.zst go-tangerine-f59a3b67f69b26f969084e0de165435e80bd8e12.zip | |
StateManager => BlockManager
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/hexface.go | 4 | ||||
| -rw-r--r-- | xeth/pipe.go | 8 | ||||
| -rw-r--r-- | xeth/world.go | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/xeth/hexface.go b/xeth/hexface.go index 5c8e7a3c7..21e82e37d 100644 --- a/xeth/hexface.go +++ b/xeth/hexface.go @@ -224,10 +224,10 @@ func (self *JSXEth) Transact(key, toStr, valueStr, gasStr, gasPriceStr, codeStr tx = chain.NewTransactionMessage(hash, value, gas, gasPrice, data) } - acc := self.obj.StateManager().TransState().GetOrNewStateObject(keyPair.Address()) + acc := self.obj.BlockManager().TransState().GetOrNewStateObject(keyPair.Address()) tx.Nonce = acc.Nonce acc.Nonce += 1 - self.obj.StateManager().TransState().UpdateStateObject(acc) + self.obj.BlockManager().TransState().UpdateStateObject(acc) tx.Sign(keyPair.PrivateKey) self.obj.TxPool().QueueTransaction(tx) diff --git a/xeth/pipe.go b/xeth/pipe.go index 25a69137d..abed8ef9a 100644 --- a/xeth/pipe.go +++ b/xeth/pipe.go @@ -24,7 +24,7 @@ type VmVars struct { type XEth struct { obj chain.EthManager - stateManager *chain.StateManager + blockManager *chain.BlockManager blockChain *chain.ChainManager world *World @@ -34,7 +34,7 @@ type XEth struct { func New(obj chain.EthManager) *XEth { pipe := &XEth{ obj: obj, - stateManager: obj.StateManager(), + blockManager: obj.BlockManager(), blockChain: obj.ChainManager(), } pipe.world = NewWorld(pipe) @@ -137,10 +137,10 @@ func (self *XEth) Transact(key *crypto.KeyPair, rec []byte, value, gas, price *e tx = chain.NewTransactionMessage(hash, value.BigInt(), gas.BigInt(), price.BigInt(), data) } - acc := self.stateManager.TransState().GetOrNewStateObject(key.Address()) + acc := self.blockManager.TransState().GetOrNewStateObject(key.Address()) tx.Nonce = acc.Nonce acc.Nonce += 1 - self.stateManager.TransState().UpdateStateObject(acc) + self.blockManager.TransState().UpdateStateObject(acc) tx.Sign(key.PrivateKey) self.obj.TxPool().QueueTransaction(tx) diff --git a/xeth/world.go b/xeth/world.go index dda2df274..6fb757d67 100644 --- a/xeth/world.go +++ b/xeth/world.go @@ -23,7 +23,7 @@ func (self *XEth) World() *World { } func (self *World) State() *state.State { - return self.pipe.stateManager.CurrentState() + return self.pipe.blockManager.CurrentState() } func (self *World) Get(addr []byte) *Object { |