M data/data.go → data/data.go

@@ -1,13 +1,18 @@
 package data
 
 import (
-	"os"
+	"bytes"
 	"fmt"
-	"bytes"
 	"io/ioutil"
+	"os"
+
 	shell "github.com/ipfs/go-ipfs-api"
 )
 
+type Record struct {
+	Shell *shell.Message
+}
+
 func Publish(object []byte) string {
 	sh := shell.NewShell("localhost:5001")
 	cid, err := sh.Add(bytes.NewBuffer(object))
@@ -21,12 +26,11 @@
 func Pin(path string) {
 	sh := shell.NewShell("localhost:5001")
 	err := sh.Pin(path)
-	if err != nil{
+	if err != nil {
 		fmt.Fprintf(os.Stderr, "error: %s", err)
 		os.Exit(1)
 	}
 }
-
 
 func Retrieve(hash string) []byte {
 	sh := shell.NewShell("localhost:5001")

M net/net.go → net/net.go

@@ -3,25 +3,24 @@
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/vocdoni/dvote-relay/batch"
-	"github.com/vocdoni/dvote-relay/types"
 	"github.com/vocdoni/dvote-relay/data"
-	shell "github.com/ipfs/go-ipfs-api"
+	"github.com/vocdoni/dvote-relay/types"
 )
-
 
 func Sub(topic string) error {
 	subscription := data.PsSubscribe(topic)
 	fmt.Println("Subscribed > " + topic)
-	var msg shell.PubSubRecord
+	var msg data.Record
 	var err error
 	for {
-		msg, err = subscription.Next()
+		msg.Shell, err = subscription.Next()
 		if err != nil {
 			return err
 		}
 
-		payload := msg.Data()
+		payload := msg.Shell.Data
 
 		var e types.Envelope
 		var b types.Ballot