debugging code

This commit is contained in:
obscuren
2014-11-11 12:16:36 +01:00
parent 9509322ecd
commit 75ee3b3f08
7 changed files with 111 additions and 66 deletions

View File

@ -1,6 +1,11 @@
package state
import "github.com/ethereum/go-ethereum/ethutil"
import (
"fmt"
"strings"
"github.com/ethereum/go-ethereum/ethutil"
)
type Log struct {
Address []byte
@ -26,6 +31,10 @@ func (self Log) RlpData() interface{} {
return []interface{}{self.Address, ethutil.ByteSliceToInterface(self.Topics), self.Data}
}
func (self Log) String() string {
return fmt.Sprintf(`log: %x %x %x`, self.Address, self.Topics, self.Data)
}
type Logs []Log
func (self Logs) RlpData() interface{} {
@ -36,3 +45,11 @@ func (self Logs) RlpData() interface{} {
return data
}
func (self Logs) String() string {
var logs []string
for _, log := range self {
logs = append(logs, log.String())
}
return "[ " + strings.Join(logs, ", ") + " ]"
}

View File

@ -62,7 +62,7 @@ func (self *State) Refund(addr []byte, gas, price *big.Int) {
self.refund[string(addr)] = new(big.Int)
}
self.refund[string(addr)] = new(big.Int).Add(self.refund[string(addr)], amount)
self.refund[string(addr)].Add(self.refund[string(addr)], amount)
}
func (self *State) AddBalance(addr []byte, amount *big.Int) {
@ -237,8 +237,8 @@ func (self *State) Set(state *State) {
self.logs = state.logs
}
func (s *State) Root() interface{} {
return s.Trie.Root
func (s *State) Root() []byte {
return s.Trie.GetRoot()
}
// Resets the trie and all siblings