Merge pull request #300 from skycoin/bug/fix-create-loop

reverted json encoding
skycoin · Apr 23, 2019 · 18eed39 · 18eed39
2 parents de0a3c6 + 0d9590e
commit 18eed39
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/pkg/router/route_manager.go b/pkg/router/route_manager.go
@@ -78,7 +78,6 @@ func (rm *routeManager) Serve(rw io.ReadWriter) error {
 	t, body, err := proto.ReadPacket()
 
 	if err != nil {
-		fmt.Println("err:", err)
 		return err
 	}
 	rm.Logger.Infof("Got new Setup request with type %s", t)

diff --git a/pkg/routing/loop.go b/pkg/routing/loop.go
@@ -9,12 +9,12 @@ import (
 
 // Loop defines a loop over a pair of routes.
 type Loop struct {
-	LocalPort    uint16    `json:"local_port"`
-	RemotePort   uint16    `json:"remote_port"`
-	Forward      Route     `json:"forward_route"`
-	Reverse      Route     `json:"reverse_route"`
-	Expiry       time.Time `json:"expiry"`
-	NoiseMessage []byte    `json:"-"`
+	LocalPort    uint16
+	RemotePort   uint16
+	Forward      Route
+	Reverse      Route
+	Expiry       time.Time
+	NoiseMessage []byte
 }
 
 // Initiator returns initiator of the Loop.

diff --git a/pkg/routing/route.go b/pkg/routing/route.go
@@ -12,9 +12,9 @@ import (
 
 // Hop defines a route hop between 2 nodes.
 type Hop struct {
-	From      cipher.PubKey `json:"src"`
-	To        cipher.PubKey `json:"dst"`
-	Transport uuid.UUID     `json:"tid"`
+	From      cipher.PubKey
+	To        cipher.PubKey
+	Transport uuid.UUID
 }
 
 func (h Hop) String() string {

diff --git a/pkg/setup/protocol.go b/pkg/setup/protocol.go
@@ -56,11 +56,11 @@ const (
 
 // LoopData stores loop confirmation request data.
 type LoopData struct {
-	RemotePK     cipher.PubKey   `json:"remote_pk"`
-	RemotePort   uint16          `json:"remote_port"`
-	LocalPort    uint16          `json:"local_port"`
-	RouteID      routing.RouteID `json:"resp_rid,omitempty"`
-	NoiseMessage []byte          `json:"noise_msg,omitempty"`
+	RemotePK     cipher.PubKey   `json:"remote-pk"`
+	RemotePort   uint16          `json:"remote-port"`
+	LocalPort    uint16          `json:"local-port"`
+	RouteID      routing.RouteID `json:"resp-rid,omitempty"`
+	NoiseMessage []byte          `json:"noise-msg,omitempty"`
 }
 
 // Protocol defines routes setup protocol.