swarm/pss: Rebase on master after handler refactor and new kaddepth m…

…erge
ethersphere · Nov 26, 2018 · 9fc6a4b · 9fc6a4b
1 parent 695a5cc
commit 9fc6a4b
Show file tree

Hide file tree

Showing 2 changed files with 455 additions and 1 deletion.
diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go
@@ -770,7 +770,7 @@ func (p *Pss) SendRaw(address PssAddress, topic Topic, msg []byte) error {
 
 	// if we have a proxhandler on this topic
 	// also deliver message to ourselves
-	if p.isSelfPossibleRecipient(pssMsg, true) && p.topicHandlerCaps[topic].prox {
+	if p.topicHandlerCaps[topic].prox && p.isSelfPossibleRecipient(pssMsg, true) {
 		return p.process(pssMsg, true, true)
 	}
 	return nil