Rename for clarity

This commit is contained in:
Taylor Gerring
2015-03-19 23:20:54 -04:00
parent 7b45f3377f
commit 6669ef5b70
3 changed files with 21 additions and 21 deletions

View File

@ -46,6 +46,13 @@ func NewEthereumApi(eth *xeth.XEth, dataDir string) *EthereumApi {
return api
}
func (self *EthereumApi) xeth() *xeth.XEth {
self.xethMu.RLock()
defer self.xethMu.RUnlock()
return self.eth
}
func (self *EthereumApi) xethWithStateNum(num int64) *xeth.XEth {
chain := self.xeth().Backend().ChainManager()
var block *types.Block
@ -328,7 +335,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
return err
}
v, err := p.GetBlockByHash(args.BlockHash, args.Transactions)
v, err := p.GetBlockByHash(args.BlockHash, args.IncludeTxs)
if err != nil {
return err
}
@ -339,7 +346,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
return err
}
v, err := p.GetBlockByNumber(args.BlockNumber, args.Transactions)
v, err := p.GetBlockByNumber(args.BlockNumber, args.IncludeTxs)
if err != nil {
return err
}
@ -580,13 +587,6 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
return nil
}
func (self *EthereumApi) xeth() *xeth.XEth {
self.xethMu.RLock()
defer self.xethMu.RUnlock()
return self.eth
}
func toFilterOptions(options *FilterOptions) *core.FilterOptions {
var opts core.FilterOptions