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

Removed RlpValue in favour of Value

Browse Source
This commit is contained in:
obscuren
2014-02-15 01:34:18 +01:00
parent f247f0c518
commit 73fd358d94
8 changed files with 29 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ethchain/block.go
View File

@ -102,7 +102,7 @@ func CreateBlock(root interface{},
// Returns a hash of the block
func (block *Block) Hash() []byte {
return ethutil.Sha3Bin(block.RlpValue().Encode())
return ethutil.Sha3Bin(block.Value().Encode())
}
func (block *Block) HashNoNonce() []byte {
@ -261,14 +261,14 @@ func (block *Block) SetTransactions(txs []*Transaction) {
block.TxSha = ethutil.Sha3Bin(ethutil.Encode(block.rlpTxs()))
}
func (block *Block) RlpValue() *ethutil.RlpValue {
return ethutil.NewRlpValue([]interface{}{block.header(), block.rlpTxs(), block.rlpUncles()})
func (block *Block) Value() *ethutil.Value {
return ethutil.NewValue([]interface{}{block.header(), block.rlpTxs(), block.rlpUncles()})
}
func (block *Block) RlpEncode() []byte {
// Encode a slice interface which contains the header and the list of
// transactions.
return block.RlpValue().Encode()
return block.Value().Encode()
}
func (block *Block) RlpDecode(data []byte) {

2
ethchain/block_chain.go
View File

@ -103,7 +103,7 @@ func (bc *BlockChain) GetChainFromHash(hash []byte, max uint64) []interface{} {
block := bc.GetBlock(currentHash)
currentHash = block.PrevHash
chain = append(chain, block.RlpValue().Value)
chain = append(chain, block.Value().Val)
//chain = append([]interface{}{block.RlpValue().Value}, chain...)
num--

8
ethchain/block_manager.go
View File

@ -553,9 +553,9 @@ out:
// Load the value in storage and push it on the stack
x := bm.stack.Pop()
// decode the object as a big integer
decoder := ethutil.NewRlpValueFromBytes([]byte(contract.State().Get(x.String())))
decoder := ethutil.NewValueFromBytes([]byte(contract.State().Get(x.String())))
if !decoder.IsNil() {
bm.stack.Push(decoder.AsBigInt())
bm.stack.Push(decoder.BigInt())
} else {
bm.stack.Push(ethutil.BigFalse)
}
@ -618,10 +618,10 @@ func getContractMemory(block *Block, contractAddr []byte, memAddr *big.Int) *big
val := contract.State().Get(memAddr.String())
// decode the object as a big integer
decoder := ethutil.NewRlpValueFromBytes([]byte(val))
decoder := ethutil.NewValueFromBytes([]byte(val))
if decoder.IsNil() {
return ethutil.BigFalse
}
return decoder.AsBigInt()
return decoder.BigInt()
}

14
ethchain/contract.go
View File

@ -23,11 +23,11 @@ func (c *Contract) RlpEncode() []byte {
}
func (c *Contract) RlpDecode(data []byte) {
decoder := ethutil.NewRlpValueFromBytes(data)
decoder := ethutil.NewValueFromBytes(data)
c.Amount = decoder.Get(0).AsBigInt()
c.Nonce = decoder.Get(1).AsUint()
c.state = ethutil.NewTrie(ethutil.Config.Db, decoder.Get(2).AsRaw())
c.Amount = decoder.Get(0).BigInt()
c.Nonce = decoder.Get(1).Uint()
c.state = ethutil.NewTrie(ethutil.Config.Db, decoder.Get(2).Interface())
}
func (c *Contract) State() *ethutil.Trie {
@ -59,8 +59,8 @@ func (a *Address) RlpEncode() []byte {
}
func (a *Address) RlpDecode(data []byte) {
decoder := ethutil.NewRlpValueFromBytes(data)
decoder := ethutil.NewValueFromBytes(data)
a.Amount = decoder.Get(0).AsBigInt()
a.Nonce = decoder.Get(1).AsUint()
a.Amount = decoder.Get(0).BigInt()
a.Nonce = decoder.Get(1).Uint()
}