DRY up the use of fromHex and put it in ethutil
This commit is contained in:
@ -17,15 +17,6 @@ import (
|
||||
func toHex(b []byte) string {
|
||||
return "0x" + ethutil.Bytes2Hex(b)
|
||||
}
|
||||
func fromHex(s string) []byte {
|
||||
if len(s) > 1 {
|
||||
if s[0:2] == "0x" {
|
||||
s = s[2:]
|
||||
}
|
||||
return ethutil.Hex2Bytes(s)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type Object struct {
|
||||
*state.StateObject
|
||||
@ -123,7 +114,7 @@ func (self *Block) ToString() string {
|
||||
}
|
||||
|
||||
func (self *Block) GetTransaction(hash string) *Transaction {
|
||||
tx := self.ref.Transaction(fromHex(hash))
|
||||
tx := self.ref.Transaction(ethutil.FromHex(hash))
|
||||
if tx == nil {
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user