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

Consolidate raw

Browse Source
This commit is contained in:
p4u
2019-02-25 16:13:55 +01:00
parent 63d6c72bc0
commit cd19d5b044
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pssTest/psstest.go
View File

@@ -49,9 +49,11 @@ func main() {
}() }()
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
for { for {
fmt.Printf("-> Sending %s pss to [%s]\n", kind, key) fmt.Printf("-> Sending %s pss to [%s]\n", kind, key)
err := sn.PssPub(kind, key, topic, fmt.Sprintf("Hello world from %s", hostname), "") currentTime := int64(time.Now().Unix())
err := sn.PssPub(kind, key, topic, fmt.Sprintf("Hello world from %s at %d", hostname, currentTime), "")
log.Info("pss sent", "err", err) log.Info("pss sent", "err", err)
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
} }

12
net/swarm/swarm.go
View File

@@ -265,8 +265,7 @@ func strAddress(addr string) pss.PssAddress {
func (sn *SwarmNet) PssSub(subType, key, topic, address string) error { func (sn *SwarmNet) PssSub(subType, key, topic, address string) error {
pssTopic := strTopic(topic) pssTopic := strTopic(topic)
pssAddress := strAddress(address) pssAddress := strAddress(address)
switch subType { if subType == "sym" {
case "sym":
_, err := sn.Pss.SetSymmetricKey(strSymKey(key), pssTopic, pssAddress, true) _, err := sn.Pss.SetSymmetricKey(strSymKey(key), pssTopic, pssAddress, true)
if err != nil { if err != nil {
return err return err
@@ -278,14 +277,17 @@ func (sn *SwarmNet) PssSub(subType, key, topic, address string) error {
sn.PssTopics[topic].Delivery = make(chan []byte) sn.PssTopics[topic].Delivery = make(chan []byte)
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.Info("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 <- msg
return nil return nil
} }
topicHandler := pss.NewHandler(pssHandler) topicHandler := pss.NewHandler(pssHandler)
if subType == "raw" {
topicHandler = topicHandler.WithProxBin().WithRaw()
}
sn.PssTopics[topic].Unregister = sn.Pss.Register(&pssTopic, topicHandler) sn.PssTopics[topic].Unregister = sn.Pss.Register(&pssTopic, topicHandler)
log.Info(fmt.Sprintf("Subscribed to topic %s", pssTopic.String())) log.Info(fmt.Sprintf("Subscribed to [%s] topic %s", subType, pssTopic.String()))
return nil return nil
} }
@@ -302,7 +304,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" {
err = sn.Pss.SendRaw(hexutil.Bytes(dstAddr), dstTopic, hexutil.Bytes(msg)) err = sn.Pss.SendRaw(hexutil.Bytes(address), dstTopic, hexutil.Bytes(msg))
} }
if subType == "asym" { if subType == "asym" {
// add 0x prefix if not present // add 0x prefix if not present