diff options
Diffstat (limited to 'ethchain/transaction.go')
| -rw-r--r-- | ethchain/transaction.go | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/ethchain/transaction.go b/ethchain/transaction.go index 10bf5bc8e..331f44b55 100644 --- a/ethchain/transaction.go +++ b/ethchain/transaction.go @@ -8,7 +8,6 @@ import ( "github.com/ethereum/go-ethereum/ethcrypto" "github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/vm" "github.com/obscuren/secp256k1-go" ) @@ -29,8 +28,6 @@ type Transaction struct { v byte r, s []byte - logs []vm.Log - // Indicates whether this tx is a contract creation transaction contractCreation bool } @@ -57,10 +54,6 @@ func NewTransactionFromValue(val *ethutil.Value) *Transaction { return tx } -func (self *Transaction) addLog(log vm.Log) { - self.logs = append(self.logs, log) -} - func (self *Transaction) GasValue() *big.Int { return new(big.Int).Mul(self.Gas, self.GasPrice) } @@ -212,7 +205,7 @@ type Receipt struct { PostState []byte CumulativeGasUsed *big.Int Bloom []byte - Logs vm.Logs + logs ethstate.Logs } func NewRecieptFromValue(val *ethutil.Value) *Receipt { @@ -229,12 +222,12 @@ func (self *Receipt) RlpValueDecode(decoder *ethutil.Value) { it := decoder.Get(3).NewIterator() for it.Next() { - self.Logs = append(self.Logs, vm.NewLogFromValue(it.Value())) + self.logs = append(self.logs, ethstate.NewLogFromValue(it.Value())) } } func (self *Receipt) RlpData() interface{} { - return []interface{}{self.PostState, self.CumulativeGasUsed, self.Bloom, self.Logs.RlpData()} + return []interface{}{self.PostState, self.CumulativeGasUsed, self.Bloom, self.logs.RlpData()} } func (self *Receipt) RlpEncode() []byte { |