Fixed PendingPayment methods to assign for add and delete

pkg/client/oniontypes_test.go

@@ -41,8 +41,7 @@ func TestPing(t *testing.T) {
 		log.T.S("received ping confirmation ID", cf)
 		quit.Q()
 	}, os[len(os)-1].(*confirm.OnionSkin).ID)
-	o := os.Assemble()
-	b := wire.EncodeOnion(o)
+	b := wire.EncodeOnion(os.Assemble())
 	log.T.S("sending ping with ID", os[len(os)-1].(*confirm.OnionSkin))
 	clients[0].Send(clients[0].Nodes[0].AddrPort, b)
 	go func() {
@@ -104,8 +103,7 @@ func TestSendExit(t *testing.T) {
 			}
 			quit.Q()
 		})
-	o := os.Assemble()
-	b := wire.EncodeOnion(o)
+	b := wire.EncodeOnion(os.Assemble())
 	log.T.Ln(clients[0].Node.AddrPort.String())
 	clients[0].Node.Send(b)
 	go func() {
@@ -173,8 +171,7 @@ func TestSendKeys(t *testing.T) {
 		}
 		quit.Q()
 	}, cnf)
-	o := sk.Assemble()
-	b := wire.EncodeOnion(o)
+	b := wire.EncodeOnion(sk.Assemble())
 	clients[0].Send(clients[0].Nodes[0].AddrPort, b)
 	<-quit.Wait()
 	for _, v := range clients {

pkg/client/runner.go

@@ -109,7 +109,7 @@ func (cl *Client) runner() (out bool) {
 			return false
 		})
 		if !topUp {
-			cl.PendingPayments = cl.PendingPayments.Add(p)
+			cl.AddPendingPayment(p)
 			log.T.F("awaiting session keys for preimage %x",
 				p.Preimage)
 		}
@@ -333,13 +333,12 @@ func (cl *Client) session(on *session.OnionSkin, b slice.Bytes,
 		return fmt.Sprint("incoming session",
 			spew.Sdump(on.PreimageHash()))
 	})
-	pi := cl.PendingPayments.FindPreimage(on.PreimageHash())
+	pi := cl.FindPendingPreimage(on.PreimageHash())
 	if pi != nil {
-		ss := node.NewSession(pi.ID,
-			cl.Node, pi.Amount, on.Header, on.Payload, on.Hop)
-		cl.AddSession(ss)
+		cl.DeletePendingPayment(pi.Preimage)
 		log.T.F("Adding session %x\n", pi.ID)
-		cl.PendingPayments = cl.PendingPayments.Delete(pi.Preimage)
+		cl.AddSession(node.NewSession(pi.ID,
+			cl.Node, pi.Amount, on.Header, on.Payload, on.Hop))
 		cl.Node.Send(BudgeUp(b, *c))
 	} else {
 		log.T.Ln("dropping session message without payment")

pkg/node/node.go

@@ -5,7 +5,7 @@ package node
 import (
 	"fmt"
 	"net/netip"
-	"sync"
+	sync "sync"
 	"time"
 
 	"github.com/indra-labs/indra"
@@ -162,14 +162,14 @@ func (n *Node) AddPendingPayment(
 
 	n.Lock()
 	defer n.Unlock()
-	n.PendingPayments.Add(np)
+	n.PendingPayments = n.PendingPayments.Add(np)
 }
 func (n *Node) DeletePendingPayment(
 	preimage sha256.Hash) {
 
 	n.Lock()
 	defer n.Unlock()
-	n.PendingPayments.Delete(preimage)
+	n.PendingPayments = n.PendingPayments.Delete(preimage)
 }
 func (n *Node) FindPendingPayment(
 	id nonce.ID) (pp *Payment) {