From a009ee3d390f95c11a32b75641e72c90767d3d66 Mon Sep 17 00:00:00 2001 From: lash Date: Sun, 25 Jun 2017 15:49:22 +0200 Subject: [PATCH] swarm/pss: added msg to log, cleared lock error --- swarm/pss/pss.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index 9033bd409a..f126b41fe8 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -131,8 +131,6 @@ func (self *Pss) Protocols() []p2p.Protocol { // Starts the PssMsg protocol func (self *Pss) Run(p *p2p.Peer, rw p2p.MsgReadWriter) error { - self.lock.Lock() - defer self.lock.Unlock() pp := protocols.NewPeer(p, rw, pssSpec) //addr := network.NewAddrFromNodeID(id) //potaddr := pot.NewHashAddressFromBytes(addr.OAddr) @@ -326,8 +324,8 @@ func (self *Pss) Forward(msg *PssMsg) error { log.Crit("Pss cannot use kademlia peer type") return false } - //sendMsg := fmt.Sprintf("MSG %x TO %x FROM %x VIA %x", digest, common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address())) - sendMsg := fmt.Sprintf("TO %x FROM %x VIA %x", common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address())) + sendMsg := fmt.Sprintf("MSG %x TO %x FROM %x VIA %x", digest, common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address())) + //sendMsg := fmt.Sprintf("TO %x FROM %x VIA %x", common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address())) pp := self.fwdPool[sp.ID()] if self.checkFwdCache(op.Address(), digest) { log.Info(fmt.Sprintf("%v: peer already forwarded to", sendMsg))