arnaucube/go-dvote
1
0
Fork 0
mirror of https://github.com/arnaucube/go-dvote.git synced 2026-02-28 05:26:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extend pss delivery chan type

Browse Source
This commit is contained in:
p4u
2019-02-25 16:40:06 +01:00
parent cd19d5b044
commit 1c45bd6bc2
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/pssTest/psstest.go
View File

@@ -40,11 +40,11 @@ func main() {
fmt.Println("First parameter must be sym or asym") fmt.Println("First parameter must be sym or asym")
return return
} }
fmt.Printf("My PSS pubKey is %s\n", sn.PssPubKey)
go func() { go func() {
for { for {
msg := <-sn.PssTopics[topic].Delivery pmsg := <-sn.PssTopics[topic].Delivery
fmt.Printf("<- Pss received: %s\n", msg) fmt.Printf("<- Pss received msg:{%s}\n", pmsg.Msg)
} }
}() }()

15
net/swarm/swarm.go
View File

@@ -112,9 +112,16 @@ func NewSwarmPorts() *swarmPorts {
return sp return sp
} }
type pssMsg struct {
Msg []byte
Peer *p2p.Peer
Asym bool
Keyid string
}
type pssSub struct { type pssSub struct {
Unregister func() Unregister func()
Delivery (chan []byte) Delivery (chan pssMsg)
Address string Address string
} }
@@ -274,11 +281,12 @@ func (sn *SwarmNet) PssSub(subType, key, topic, address string) error {
sn.PssTopics[topic] = new(pssSub) sn.PssTopics[topic] = new(pssSub)
sn.PssTopics[topic].Address = address sn.PssTopics[topic].Address = address
sn.PssTopics[topic].Delivery = make(chan []byte) sn.PssTopics[topic].Delivery = make(chan pssMsg)
var pssHandler pss.HandlerFunc = func(msg []byte, peer *p2p.Peer, asym bool, keyid string) error { var pssHandler pss.HandlerFunc = func(msg []byte, peer *p2p.Peer, asym bool, keyid string) error {
log.Debug("pss received", "msg", fmt.Sprintf("%s", msg), "keyid", fmt.Sprintf("%s", keyid)) log.Debug("pss received", "msg", fmt.Sprintf("%s", msg), "keyid", fmt.Sprintf("%s", keyid))
sn.PssTopics[topic].Delivery <- msg
sn.PssTopics[topic].Delivery <- pssMsg{Msg: msg, Peer: peer, Asym: asym, Keyid: keyid}
return nil return nil
} }
topicHandler := pss.NewHandler(pssHandler) topicHandler := pss.NewHandler(pssHandler)
@@ -304,6 +312,7 @@ func (sn *SwarmNet) PssPub(subType, key, topic, msg, address string) error {
err = sn.Pss.SendSym(symKeyId, strTopic(topic), hexutil.Bytes(msg)) err = sn.Pss.SendSym(symKeyId, strTopic(topic), hexutil.Bytes(msg))
} }
if subType == "raw" { if subType == "raw" {
// sed raw message
err = sn.Pss.SendRaw(hexutil.Bytes(address), dstTopic, hexutil.Bytes(msg)) err = sn.Pss.SendRaw(hexutil.Bytes(address), dstTopic, hexutil.Bytes(msg))
} }
if subType == "asym" { if subType == "asym" {