From e71b198e3d8df1bd8b73bae9bc934b778a3115bf Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 5 Aug 2014 11:26:12 +0200 Subject: [PATCH] Renamed object to Object --- ethpipe/config.go | 4 ++-- ethpipe/object.go | 8 ++++---- ethpipe/pipe.go | 4 ++-- ethpipe/world.go | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ethpipe/config.go b/ethpipe/config.go index 81d36d5147..588fc8d972 100644 --- a/ethpipe/config.go +++ b/ethpipe/config.go @@ -8,7 +8,7 @@ type config struct { pipe *Pipe } -func (self *config) Get(name string) *object { +func (self *config) Get(name string) *Object { configCtrl := self.pipe.World().safeGet(cnfCtr) var addr []byte @@ -21,7 +21,7 @@ func (self *config) Get(name string) *object { objectAddr := configCtrl.GetStorage(ethutil.BigD(addr)) - return &object{self.pipe.World().safeGet(objectAddr.Bytes())} + return &Object{self.pipe.World().safeGet(objectAddr.Bytes())} } func (self *config) Exist() bool { diff --git a/ethpipe/object.go b/ethpipe/object.go index ebfb5b904d..f0032992ca 100644 --- a/ethpipe/object.go +++ b/ethpipe/object.go @@ -5,11 +5,11 @@ import ( "github.com/ethereum/eth-go/ethutil" ) -type object struct { +type Object struct { *ethstate.StateObject } -func (self *object) StorageString(str string) *ethutil.Value { +func (self *Object) StorageString(str string) *ethutil.Value { if ethutil.IsHex(str) { return self.Storage(ethutil.Hex2Bytes(str[2:])) } else { @@ -17,10 +17,10 @@ func (self *object) StorageString(str string) *ethutil.Value { } } -func (self *object) StorageValue(addr *ethutil.Value) *ethutil.Value { +func (self *Object) StorageValue(addr *ethutil.Value) *ethutil.Value { return self.Storage(addr.Bytes()) } -func (self *object) Storage(addr []byte) *ethutil.Value { +func (self *Object) Storage(addr []byte) *ethutil.Value { return self.StateObject.GetStorage(ethutil.BigD(addr)) } diff --git a/ethpipe/pipe.go b/ethpipe/pipe.go index 876a953aab..c00731b845 100644 --- a/ethpipe/pipe.go +++ b/ethpipe/pipe.go @@ -46,10 +46,10 @@ func (self *Pipe) Nonce(addr []byte) uint64 { } func (self *Pipe) Execute(addr []byte, data []byte, value, gas, price *ethutil.Value) ([]byte, error) { - return self.ExecuteObject(&object{self.World().safeGet(addr)}, data, value, gas, price) + return self.ExecuteObject(&Object{self.World().safeGet(addr)}, data, value, gas, price) } -func (self *Pipe) ExecuteObject(object *object, data []byte, value, gas, price *ethutil.Value) ([]byte, error) { +func (self *Pipe) ExecuteObject(object *Object, data []byte, value, gas, price *ethutil.Value) ([]byte, error) { var ( initiator = ethstate.NewStateObject([]byte{0}) block = self.blockChain.CurrentBlock diff --git a/ethpipe/world.go b/ethpipe/world.go index 25e2a19529..2a07f340c1 100644 --- a/ethpipe/world.go +++ b/ethpipe/world.go @@ -26,8 +26,8 @@ func (self *world) State() *ethstate.State { return self.pipe.stateManager.CurrentState() } -func (self *world) Get(addr []byte) *object { - return &object{self.State().GetStateObject(addr)} +func (self *world) Get(addr []byte) *Object { + return &Object{self.State().GetStateObject(addr)} } func (self *world) safeGet(addr []byte) *ethstate.StateObject {