gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Inline getStateWithNum

Browse Source
This commit is contained in:
Taylor Gerring
2015-03-19 19:58:59 -04:00
parent abc3d8d50a
commit 6cc02aadbf
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/api.go
View File

@@ -81,10 +81,6 @@ func (self *EthereumApi) xethWithStateNum(num int64) *xeth.XEth {
return self.xeth().WithState(st) return self.xeth().WithState(st)
} }
func (self *EthereumApi) getStateWithNum(num int64) *xeth.State {
return self.xethWithStateNum(num).State()
}
func (self *EthereumApi) start() { func (self *EthereumApi) start() {
timer := time.NewTicker(filterTickerTime) timer := time.NewTicker(filterTickerTime)
done: done:
@@ -290,8 +286,7 @@ func (p *EthereumApi) GetBalance(args *GetBalanceArgs, reply *interface{}) error
if err := args.requirements(); err != nil { if err := args.requirements(); err != nil {
return err return err
} }
state := p.getStateWithNum(args.BlockNumber).SafeGet(args.Address) *reply = common.ToHex(p.xethWithStateNum(args.BlockNumber).State().SafeGet(args.Address).Balance().Bytes())
*reply = common.ToHex(state.Balance().Bytes())
return nil return nil
} }
@@ -299,7 +294,7 @@ func (p *EthereumApi) GetStorage(args *GetStorageArgs, reply *interface{}) error
if err := args.requirements(); err != nil { if err := args.requirements(); err != nil {
return err return err
} }
*reply = p.getStateWithNum(args.BlockNumber).SafeGet(args.Address).Storage() *reply = p.xethWithStateNum(args.BlockNumber).State().SafeGet(args.Address).Storage()
return nil return nil
} }
@@ -307,9 +302,10 @@ func (p *EthereumApi) GetStorageAt(args *GetStorageAtArgs, reply *interface{}) e
if err := args.requirements(); err != nil { if err := args.requirements(); err != nil {
return err return err
} }
state := p.getStateWithNum(args.BlockNumber).SafeGet(args.Address)
state := p.xethWithStateNum(args.BlockNumber).State().SafeGet(args.Address)
value := state.StorageString(args.Key) value := state.StorageString(args.Key)
var hx string var hx string
if strings.Index(args.Key, "0x") == 0 { if strings.Index(args.Key, "0x") == 0 {
hx = string([]byte(args.Key)[2:]) hx = string([]byte(args.Key)[2:])