Merge pull request #4147 from joostjager/unify-pay-responses

router+routerrpc: unify sendtoroute and payment responses

lntest/itest/lnd_mpp_test.go

@@ -113,7 +113,7 @@ func testSendToRouteMultiPath(net *lntest.NetworkHarness, t *harnessTest) {
 		{ctx.carol, ctx.eve, ctx.bob},
 	}
 
-	responses := make(chan *routerrpc.SendToRouteResponse, len(sendRoutes))
+	responses := make(chan *lnrpc.HTLCAttempt, len(sendRoutes))
 	for _, hops := range sendRoutes {
 		// Build a route for the specified hops.
 		r, err := buildRoute(shardAmt, hops)
@@ -139,7 +139,7 @@ func testSendToRouteMultiPath(net *lntest.NetworkHarness, t *harnessTest) {
 		// block as long as the payment is in flight.
 		go func() {
 			ctxt, _ := context.WithTimeout(ctxb, defaultTimeout)
-			resp, err := net.Alice.RouterClient.SendToRoute(ctxt, sendReq)
+			resp, err := net.Alice.RouterClient.SendToRouteV2(ctxt, sendReq)
 			if err != nil {
 				t.Fatalf("unable to send payment: %v", err)
 			}
@@ -151,7 +151,7 @@ func testSendToRouteMultiPath(net *lntest.NetworkHarness, t *harnessTest) {
 	// Wait for all responses to be back, and check that they all
 	// succeeded.
 	for range sendRoutes {
-		var resp *routerrpc.SendToRouteResponse
+		var resp *lnrpc.HTLCAttempt
 		select {
 		case resp = <-responses:
 		case <-time.After(defaultTimeout):

lntest/itest/lnd_test.go

@@ -4830,7 +4830,7 @@ func testSingleHopSendToRouteCase(net *lntest.NetworkHarness, t *harnessTest,
 				Route:       r,
 			}
 			ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
-			resp, err := carol.RouterClient.SendToRoute(
+			resp, err := carol.RouterClient.SendToRouteV2(
 				ctxt, sendReq,
 			)
 			if err != nil {