From bfbec1c5d32ac0d698fdc5a6db366a9ca67c7689 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Tue, 16 Jan 2018 20:21:18 -0800
Subject: [PATCH] rpc: properly pass through the FinalCltvDelta param from the
 proto

---
 rpcserver.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rpcserver.go b/rpcserver.go
index d3a9a6f3..5e9c4e3c 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -1213,6 +1213,7 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
 	// and map the db struct to the proto response.
 	pendingOpenChannels, err := r.server.chanDB.FetchPendingChannels()
 	if err != nil {
+		rpcsLog.Errorf("unable to fetch pending channels: %v", err)
 		return nil, err
 	}
 	resp.PendingOpenChannels = make([]*lnrpc.PendingChannelsResponse_PendingOpenChannel,
@@ -1256,6 +1257,7 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
 	// can populate these fields within the response.
 	pendingCloseChannels, err := r.server.chanDB.FetchClosedChannels(true)
 	if err != nil {
+		rpcsLog.Errorf("unable to fetch closed channels: %v", err)
 		return nil, err
 	}
 	for _, pendingClose := range pendingCloseChannels {
@@ -1644,6 +1646,7 @@ func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer)
 					)
 					p.dest = nextPayment.Dest
 					p.pHash = nextPayment.PaymentHash
+					p.cltvDelta = uint16(nextPayment.FinalCltvDelta)
 				}
 
 				select {