From e15604f7b5ebd114a00c7d35e6a9624598c135e1 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Sat, 17 Jun 2017 00:11:02 +0200
Subject: [PATCH] peer: ensure latest version of htlcswitch.Peer interface is
 implemented

---
 peer.go      | 43 ++++++++++++++++++++-----------------------
 rpcserver.go |  5 ++++-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/peer.go b/peer.go
index f5bc7e2c..71ec8a0c 100644
--- a/peer.go
+++ b/peer.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"container/list"
-	"crypto/sha256"
 	"fmt"
 	"net"
 	"sync"
@@ -12,8 +11,6 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/brontide"
 
-	"github.com/btcsuite/fastsha256"
-
 	"bytes"
 
 	"github.com/go-errors/errors"
@@ -94,7 +91,7 @@ type peer struct {
 	conn    net.Conn
 
 	addr        *lnwire.NetAddress
-	lightningID chainhash.Hash
+	pubKeyBytes [33]byte
 
 	inbound bool
 	id      int32
@@ -165,9 +162,8 @@ func newPeer(conn net.Conn, connReq *connmgr.ConnReq, server *server,
 	nodePub := addr.IdentityKey
 
 	p := &peer{
-		conn:        conn,
-		lightningID: chainhash.Hash(sha256.Sum256(nodePub.SerializeCompressed())),
-		addr:        addr,
+		conn: conn,
+		addr: addr,
 
 		id:      atomic.AddInt32(&numNodes, 1),
 		inbound: inbound,
@@ -193,6 +189,7 @@ func newPeer(conn net.Conn, connReq *connmgr.ConnReq, server *server,
 		queueQuit: make(chan struct{}),
 		quit:      make(chan struct{}),
 	}
+	copy(p.pubKeyBytes[:], nodePub.SerializeCompressed())
 
 	return p, nil
 }
@@ -311,14 +308,17 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
 		// new payments triggered by RPC clients.
 		sphinxDecoder := htlcswitch.NewSphinxDecoder(p.server.sphinx)
 		link := htlcswitch.NewChannelLink(
-			&htlcswitch.ChannelLinkConfig{
+			htlcswitch.ChannelLinkConfig{
 				Peer:             p,
 				DecodeOnion:      sphinxDecoder.Decode,
 				SettledContracts: p.server.breachArbiter.settledContracts,
 				DebugHTLC:        cfg.DebugHTLC,
 				Registry:         p.server.invoices,
 				Switch:           p.server.htlcSwitch,
-			}, lnChan)
+				FwrdingPolicy:    p.server.cc.routingPolicy,
+			},
+			lnChan,
+		)
 
 		if err := p.server.htlcSwitch.AddLink(link); err != nil {
 			return err
@@ -333,7 +333,6 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
 // irrecoverable protocol error has been encountered.
 func (p *peer) WaitForDisconnect() {
 	<-p.quit
-
 }
 
 // Disconnect terminates the connection with the remote peer. Additionally, a
@@ -350,7 +349,6 @@ func (p *peer) Disconnect() {
 	p.conn.Close()
 
 	close(p.quit)
-
 }
 
 // String returns the string representation of this peer.
@@ -788,14 +786,17 @@ out:
 
 			decoder := htlcswitch.NewSphinxDecoder(p.server.sphinx)
 			link := htlcswitch.NewChannelLink(
-				&htlcswitch.ChannelLinkConfig{
+				htlcswitch.ChannelLinkConfig{
 					Peer:             p,
 					DecodeOnion:      decoder.Decode,
 					SettledContracts: p.server.breachArbiter.settledContracts,
 					DebugHTLC:        cfg.DebugHTLC,
 					Registry:         p.server.invoices,
 					Switch:           p.server.htlcSwitch,
-				}, newChanReq.channel)
+					FwrdingPolicy:    p.server.cc.routingPolicy,
+				},
+				newChanReq.channel,
+			)
 
 			err := p.server.htlcSwitch.AddLink(link)
 			if err != nil {
@@ -1070,6 +1071,8 @@ func (p *peer) handleInitClosingSigned(req *htlcswitch.ChanClose, msg *lnwire.Cl
 		return
 	}
 
+	// TODO(roasbeef): also add closure height to summary
+
 	// Clear out the current channel state, marking the channel as being
 	// closed within the database.
 	closingTxid := closeTx.TxHash()
@@ -1348,21 +1351,15 @@ func (p *peer) sendInitMsg() error {
 	return p.writeMessage(msg)
 }
 
-// SendMessage sends message to the remote peer which represented by
-// this peer.
+// SendMessage queues a message for sending to the target peer.
 func (p *peer) SendMessage(msg lnwire.Message) error {
 	p.queueMsg(msg, nil)
 	return nil
 }
 
-// ID returns the lightning network peer id.
-func (p *peer) ID() [sha256.Size]byte {
-	return fastsha256.Sum256(p.PubKey())
-}
-
-// PubKey returns the peer public key.
-func (p *peer) PubKey() []byte {
-	return p.addr.IdentityKey.SerializeCompressed()
+// PubKey returns the pubkey of the peer in compressed serialized format.
+func (p *peer) PubKey() [33]byte {
+	return p.pubKeyBytes
 }
 
 // TODO(roasbeef): make all start/stop mutexes a CAS
diff --git a/rpcserver.go b/rpcserver.go
index 347bc23f..58c8d457 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -761,7 +761,8 @@ func (r *rpcServer) GetInfo(ctx context.Context,
 
 	pendingChannels, err := r.server.fundingMgr.NumPendingChannels()
 	if err != nil {
-		return nil, fmt.Errorf("unable to get number of pending channels: %v", err)
+		return nil, fmt.Errorf("unable to get number of pending "+
+			"channels: %v", err)
 	}
 
 	idPub := r.server.identityPriv.PubKey().SerializeCompressed()
@@ -1135,6 +1136,8 @@ func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer)
 	errChan := make(chan error, 1)
 	payChan := make(chan *lnrpc.SendRequest)
 
+	// TODO(roasbeef): check payment filter to see if already used?
+
 	// In order to limit the level of concurrency and prevent a client from
 	// attempting to OOM the server, we'll set up a semaphore to create an
 	// upper ceiling on the number of outstanding payments.