aboutsummaryrefslogtreecommitdiffstats
path: root/whisper/envelope.go
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-21 07:57:18 +0800
committerFelix Lange <fjl@twurst.com>2015-03-21 07:57:18 +0800
commit069c87b960c48864dc4f1b9086adf582e1dc88a9 (patch)
tree4d24df73aa5a3e7b8db9f7b1178f4c4732e325b2 /whisper/envelope.go
parent7c4ff3abb4693bf93b2b348f572f14f2cfcf9142 (diff)
downloadgo-tangerine-069c87b960c48864dc4f1b9086adf582e1dc88a9.tar.gz
go-tangerine-069c87b960c48864dc4f1b9086adf582e1dc88a9.tar.zst
go-tangerine-069c87b960c48864dc4f1b9086adf582e1dc88a9.zip
whisper: use common.Hash
Diffstat (limited to 'whisper/envelope.go')
-rw-r--r--whisper/envelope.go23
1 files changed, 14 insertions, 9 deletions
diff --git a/whisper/envelope.go b/whisper/envelope.go
index 15a974a2c..20e3e6d39 100644
--- a/whisper/envelope.go
+++ b/whisper/envelope.go
@@ -18,26 +18,31 @@ const (
type Envelope struct {
Expiry uint32 // Whisper protocol specifies int32, really should be int64
- Ttl uint32 // ^^^^^^
+ TTL uint32 // ^^^^^^
Topics [][]byte
Data []byte
Nonce uint32
- hash Hash
+ hash common.Hash
}
-func (self *Envelope) Hash() Hash {
- if self.hash == EmptyHash {
+func (self *Envelope) Hash() common.Hash {
+ if (self.hash == common.Hash{}) {
enc, _ := rlp.EncodeToBytes(self)
- self.hash = H(crypto.Sha3(enc))
+ self.hash = crypto.Sha3Hash(enc)
}
return self.hash
}
func NewEnvelope(ttl time.Duration, topics [][]byte, data *Message) *Envelope {
exp := time.Now().Add(ttl)
-
- return &Envelope{uint32(exp.Unix()), uint32(ttl.Seconds()), topics, data.Bytes(), 0, Hash{}}
+ return &Envelope{
+ Expiry: uint32(exp.Unix()),
+ TTL: uint32(ttl.Seconds()),
+ Topics: topics,
+ Data: data.Bytes(),
+ Nonce: 0,
+ }
}
func (self *Envelope) Seal(pow time.Duration) {
@@ -104,7 +109,7 @@ func (self *Envelope) valid() bool {
}
func (self *Envelope) withoutNonce() interface{} {
- return []interface{}{self.Expiry, self.Ttl, self.Topics, self.Data}
+ return []interface{}{self.Expiry, self.TTL, self.Topics, self.Data}
}
// rlpenv is an Envelope but is not an rlp.Decoder.
@@ -119,6 +124,6 @@ func (self *Envelope) DecodeRLP(s *rlp.Stream) error {
if err := rlp.DecodeBytes(raw, (*rlpenv)(self)); err != nil {
return err
}
- self.hash = H(crypto.Sha3(raw))
+ self.hash = crypto.Sha3Hash(raw)
return nil
}