aboutsummaryrefslogtreecommitdiffstats
path: root/whisper
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-23 21:29:01 +0800
committerobscuren <geffobscura@gmail.com>2015-01-23 21:29:01 +0800
commit7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c (patch)
treea6d55756ec833b3651e5805726813a7ef5af3399 /whisper
parent215780ab562b940bfc653c16bf84f812ef062821 (diff)
parentd792e95c214c8352e6b23b798101e90844eaa7a3 (diff)
downloadgo-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar
go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.gz
go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.bz2
go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.lz
go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.xz
go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.zst
go-tangerine-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.zip
Merge branch 'develop' into jsonrpc
Diffstat (limited to 'whisper')
-rw-r--r--whisper/main.go2
-rw-r--r--whisper/peer.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/whisper/main.go b/whisper/main.go
index edd5f7004..9f35dbb8d 100644
--- a/whisper/main.go
+++ b/whisper/main.go
@@ -7,10 +7,10 @@ import (
"log"
"os"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/whisper"
- "github.com/obscuren/secp256k1-go"
)
func main() {
diff --git a/whisper/peer.go b/whisper/peer.go
index f82cc6e3e..332ddd22a 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -81,7 +81,7 @@ func (self *peer) broadcast(envelopes []*Envelope) error {
if err := self.ws.WriteMsg(msg); err != nil {
return err
}
- self.peer.Infoln("broadcasted", i, "message(s)")
+ self.peer.DebugDetailln("broadcasted", i, "message(s)")
}
return nil