From 0734f03a83ef74f84a57f706ca51d0b469e6adec Mon Sep 17 00:00:00 2001
From: p4u <p4u@dabax.net>
Date: Mon, 25 Feb 2019 14:12:56 +0100
Subject: [PATCH] Consolidating asymetric messages

---
 cmd/pssTest/psstest.go | 28 ++++++++++++++++++++++++----
 net/swarm/swarm.go     | 10 +++++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/cmd/pssTest/psstest.go b/cmd/pssTest/psstest.go
index 362da5e..3384b5d 100644
--- a/cmd/pssTest/psstest.go
+++ b/cmd/pssTest/psstest.go
@@ -10,26 +10,46 @@ import (
 )
 
 func main() {
+	if len(os.Args) < 2 {
+		fmt.Println("Use <sym|asym> <key>")
+		return
+	}
+
 	sn := new(swarm.SwarmNet)
 	err := sn.Init()
 	if err != nil {
 		fmt.Printf("%v\n", err)
 		return
 	}
-	key := os.Args[1]
+	err = sn.SetLog("crit")
+	if err != nil {
+		fmt.Printf("Cannot set loglevel %v\n", err)
+	}
+
+	kind := os.Args[1]
 	topic := "vocdoni_test"
+	var key string
+
+	if kind == "sym" || kind == "asym" {
+		key = os.Args[2]
+		sn.PssSub(kind, key, topic, "")
+		defer sn.PssTopics[topic].Unregister()
+	} else {
+		fmt.Println("First parameter must be sym or asym")
+		return
+	}
 
-	sn.PssSub("asym", key, topic, "")
 	go func() {
 		for {
 			msg := <-sn.PssTopics[topic].Delivery
-			fmt.Printf("Pss received: %s\n", msg)
+			fmt.Printf("<- Pss received: %s\n", msg)
 		}
 	}()
 
 	hostname, _ := os.Hostname()
 	for {
-		err := sn.PssPub("asym", key, topic, fmt.Sprintf("Hello world from %s", hostname), "")
+		fmt.Printf("-> Sending %s pss to [%s]\n", kind, key)
+		err := sn.PssPub(kind, key, topic, fmt.Sprintf("Hello world from %s", hostname), "")
 		log.Info("pss sent", "err", err)
 		time.Sleep(10 * time.Second)
 	}
diff --git a/net/swarm/swarm.go b/net/swarm/swarm.go
index b9e4e79..8929a4b 100644
--- a/net/swarm/swarm.go
+++ b/net/swarm/swarm.go
@@ -132,14 +132,18 @@ type SwarmNet struct {
 	Ports      *swarmPorts
 }
 
-func (sn *SwarmNet) SetLog() {
+func (sn *SwarmNet) SetLog(level string) error {
 	// ensure good log formats for terminal
 	// handle verbosity flag
+	loglevel, err := log.LvlFromString(level)
+	if err != nil {
+		return err
+	}
 	hs := log.StreamHandler(os.Stderr, log.TerminalFormat(true))
-	loglevel := log.LvlInfo
 	hf := log.LvlFilterHandler(loglevel, hs)
 	h := log.CallerFileHandler(hf)
 	log.Root().SetHandler(h)
+	return nil
 }
 
 func (sn *SwarmNet) PrintStats() {
@@ -177,7 +181,7 @@ func (sn *SwarmNet) Init() error {
 		os.MkdirAll(sn.Datadir, 0755)
 	}
 
-	sn.SetLog()
+	sn.SetLog("info")
 	sn.Ports = NewSwarmPorts()
 
 	// create node