aboutsummaryrefslogtreecommitdiffstats
path: root/whisper
diff options
context:
space:
mode:
Diffstat (limited to 'whisper')
-rw-r--r--whisper/message.go2
-rw-r--r--whisper/peer.go2
-rw-r--r--whisper/whisper.go5
3 files changed, 7 insertions, 2 deletions
diff --git a/whisper/message.go b/whisper/message.go
index db0110b4a..5bda849ec 100644
--- a/whisper/message.go
+++ b/whisper/message.go
@@ -2,6 +2,7 @@ package whisper
import (
"crypto/ecdsa"
+ "fmt"
"time"
"github.com/ethereum/go-ethereum/crypto"
@@ -53,6 +54,7 @@ type Opts struct {
}
func (self *Message) Seal(pow time.Duration, opts Opts) (*Envelope, error) {
+ fmt.Println(opts)
if opts.From != nil {
err := self.sign(opts.From)
if err != nil {
diff --git a/whisper/peer.go b/whisper/peer.go
index d42b374b5..f82cc6e3e 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -55,7 +55,7 @@ out:
case <-relay.C:
err := self.broadcast(self.host.envelopes())
if err != nil {
- self.peer.Infoln(err)
+ self.peer.Infoln("broadcast err:", err)
break out
}
diff --git a/whisper/whisper.go b/whisper/whisper.go
index ffcdd7d40..71a4e841e 100644
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@@ -4,6 +4,7 @@ import (
"bytes"
"crypto/ecdsa"
"errors"
+ "fmt"
"sync"
"time"
@@ -143,6 +144,7 @@ func (self *Whisper) msgHandler(peer *p2p.Peer, ws p2p.MsgReadWriter) error {
if err != nil {
return err
}
+ fmt.Println("reading message")
envelope, err := NewEnvelopeFromReader(msg.Payload)
if err != nil {
@@ -160,6 +162,7 @@ func (self *Whisper) msgHandler(peer *p2p.Peer, ws p2p.MsgReadWriter) error {
// takes care of adding envelopes to the messages pool. At this moment no sanity checks are being performed.
func (self *Whisper) add(envelope *Envelope) error {
+ fmt.Println("adding")
if !envelope.valid() {
return errors.New("invalid pow provided for envelope")
}
@@ -229,11 +232,11 @@ func (self *Whisper) envelopes() (envelopes []*Envelope) {
func (self *Whisper) postEvent(envelope *Envelope) {
for _, key := range self.keys {
if message, err := envelope.Open(key); err == nil || (err != nil && err == ecies.ErrInvalidPublicKey) {
- // Create a custom filter?
self.filters.Notify(filter.Generic{
Str1: string(crypto.FromECDSA(key)), Str2: string(crypto.FromECDSAPub(message.Recover())),
Data: bytesToMap(envelope.Topics),
}, message)
+ break
} else {
wlogger.Infoln(err)
}