Merge pull request #3 from ethereum/develop

Update to develop

1 files changed, 52 insertions, 12 deletions

diff --git a/state/log.go b/state/log.go
index 73039d7ce..46360f4aa 100644
--- a/state/log.go
+++ b/state/log.go
@@ -1,29 +1,61 @@
 package state
 
-import "github.com/ethereum/go-ethereum/ethutil"
+import (
+	"fmt"
 
-type Log struct {
-	Address []byte
-	Topics  [][]byte
-	Data    []byte
+	"github.com/ethereum/go-ethereum/ethutil"
+)
+
+type Log interface {
+	ethutil.RlpEncodable
+
+	Address() []byte
+	Topics() [][]byte
+	Data() []byte
+}
+
+type StateLog struct {
+	address []byte
+	topics  [][]byte
+	data    []byte
+}
+
+func NewLog(address []byte, topics [][]byte, data []byte) *StateLog {
+	return &StateLog{address, topics, data}
+}
+
+func (self *StateLog) Address() []byte {
+	return self.address
+}
+
+func (self *StateLog) Topics() [][]byte {
+	return self.topics
+}
+
+func (self *StateLog) Data() []byte {
+	return self.data
 }
 
-func NewLogFromValue(decoder *ethutil.Value) Log {
-	log := Log{
-		Address: decoder.Get(0).Bytes(),
-		Data:    decoder.Get(2).Bytes(),
+func NewLogFromValue(decoder *ethutil.Value) *StateLog {
+	log := &StateLog{
+		address: decoder.Get(0).Bytes(),
+		data:    decoder.Get(2).Bytes(),
 	}
 
 	it := decoder.Get(1).NewIterator()
 	for it.Next() {
-		log.Topics = append(log.Topics, it.Value().Bytes())
+		log.topics = append(log.topics, it.Value().Bytes())
 	}
 
 	return log
 }
 
-func (self Log) RlpData() interface{} {
-	return []interface{}{self.Address, ethutil.ByteSliceToInterface(self.Topics), self.Data}
+func (self *StateLog) RlpData() interface{} {
+	return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topics), self.data}
+}
+
+func (self *StateLog) String() string {
+	return fmt.Sprintf(`log: %x %x %x`, self.address, self.topics, self.data)
 }
 
 type Logs []Log
@@ -36,3 +68,11 @@ func (self Logs) RlpData() interface{} {
 
 	return data
 }
+
+func (self Logs) String() (ret string) {
+	for _, log := range self {
+		ret += fmt.Sprintf("%v", log)
+	}
+
+	return "[" + ret + "]"
+}