From fe376385d1c864453ad08353b62e5da6f9b60a57 Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Tue, 25 Oct 2022 21:27:40 +0800 Subject: [PATCH] lntemp+lntest: fix make lint --- lntemp/rpc/router.go | 2 + lntest/harness_node.go | 2 +- lntest/itest/lnd_routing_test.go | 83 ++++++++++++++++++-------------- 3 files changed, 51 insertions(+), 36 deletions(-) diff --git a/lntemp/rpc/router.go b/lntemp/rpc/router.go index 70f09fc10..368ceffae 100644 --- a/lntemp/rpc/router.go +++ b/lntemp/rpc/router.go @@ -14,6 +14,8 @@ import ( // UpdateChanStatus makes a UpdateChanStatus RPC call to node's RouterClient // and asserts. +// +//nolint:lll func (h *HarnessRPC) UpdateChanStatus( req *routerrpc.UpdateChanStatusRequest) *routerrpc.UpdateChanStatusResponse { diff --git a/lntest/harness_node.go b/lntest/harness_node.go index 1eb0b9ac8..67cffe1bb 100644 --- a/lntest/harness_node.go +++ b/lntest/harness_node.go @@ -487,7 +487,7 @@ func executePgQuery(query string) error { postgresDatabaseDsn("postgres"), ) if err != nil { - return fmt.Errorf("unable to connect to database: %v", err) + return fmt.Errorf("unable to connect to database: %w", err) } defer pool.Close() diff --git a/lntest/itest/lnd_routing_test.go b/lntest/itest/lnd_routing_test.go index a27300337..e425dbe44 100644 --- a/lntest/itest/lnd_routing_test.go +++ b/lntest/itest/lnd_routing_test.go @@ -901,73 +901,86 @@ func testQueryRoutes(ht *lntemp.HarnessTest) { for i, route := range routesRes.Routes { expectedTotalFeesMSat := lnwire.MilliSatoshi(len(route.Hops)-1) * feePerHopMSat - expectedTotalAmtMSat := (paymentAmt * mSat) + expectedTotalFeesMSat - if route.TotalFees != route.TotalFeesMsat/mSat { // nolint:staticcheck + expectedTotalAmtMSat := + (paymentAmt * mSat) + expectedTotalFeesMSat + + if route.TotalFees != route.TotalFeesMsat/mSat { ht.Fatalf("route %v: total fees %v (msat) does not "+ "round down to %v (sat)", - i, route.TotalFeesMsat, route.TotalFees) // nolint:staticcheck + i, route.TotalFeesMsat, route.TotalFees) } if route.TotalFeesMsat != int64(expectedTotalFeesMSat) { - ht.Fatalf("route %v: total fees in msat expected %v got %v", - i, expectedTotalFeesMSat, route.TotalFeesMsat) + ht.Fatalf("route %v: total fees in msat expected %v "+ + "got %v", i, expectedTotalFeesMSat, + route.TotalFeesMsat) } - if route.TotalAmt != route.TotalAmtMsat/mSat { // nolint:staticcheck + if route.TotalAmt != route.TotalAmtMsat/mSat { ht.Fatalf("route %v: total amt %v (msat) does not "+ "round down to %v (sat)", - i, route.TotalAmtMsat, route.TotalAmt) // nolint:staticcheck + i, route.TotalAmtMsat, route.TotalAmt) } if route.TotalAmtMsat != int64(expectedTotalAmtMSat) { - ht.Fatalf("route %v: total amt in msat expected %v got %v", - i, expectedTotalAmtMSat, route.TotalAmtMsat) + ht.Fatalf("route %v: total amt in msat expected %v "+ + "got %v", i, expectedTotalAmtMSat, + route.TotalAmtMsat) } - // For all hops except the last, we check that fee equals feePerHop - // and amount to forward deducts feePerHop on each hop. + // For all hops except the last, we check that fee equals + // feePerHop and amount to forward deducts feePerHop on each + // hop. expectedAmtToForwardMSat := expectedTotalAmtMSat for j, hop := range route.Hops[:len(route.Hops)-1] { expectedAmtToForwardMSat -= feePerHopMSat - if hop.Fee != hop.FeeMsat/mSat { // nolint:staticcheck - ht.Fatalf("route %v hop %v: fee %v (msat) does not "+ - "round down to %v (sat)", - i, j, hop.FeeMsat, hop.Fee) // nolint:staticcheck + if hop.Fee != hop.FeeMsat/mSat { + ht.Fatalf("route %v hop %v: fee %v (msat) "+ + "does not round down to %v (sat)", + i, j, hop.FeeMsat, hop.Fee) } if hop.FeeMsat != int64(feePerHopMSat) { - ht.Fatalf("route %v hop %v: fee in msat expected %v got %v", + ht.Fatalf("route %v hop %v: fee in msat "+ + "expected %v got %v", i, j, feePerHopMSat, hop.FeeMsat) } - if hop.AmtToForward != hop.AmtToForwardMsat/mSat { // nolint:staticcheck - ht.Fatalf("route %v hop %v: amt to forward %v (msat) does not "+ - "round down to %v (sat)", - i, j, hop.AmtToForwardMsat, hop.AmtToForward) // nolint:staticcheck + if hop.AmtToForward != hop.AmtToForwardMsat/mSat { + ht.Fatalf("route %v hop %v: amt to forward %v"+ + "(msat) does not round down to %v(sat)", + i, j, hop.AmtToForwardMsat, + hop.AmtToForward) } - if hop.AmtToForwardMsat != int64(expectedAmtToForwardMSat) { - ht.Fatalf("route %v hop %v: amt to forward in msat "+ - "expected %v got %v", - i, j, expectedAmtToForwardMSat, hop.AmtToForwardMsat) + if hop.AmtToForwardMsat != + int64(expectedAmtToForwardMSat) { + + ht.Fatalf("route %v hop %v: amt to forward "+ + "in msat expected %v got %v", + i, j, expectedAmtToForwardMSat, + hop.AmtToForwardMsat) } } - // Last hop should have zero fee and amount to forward should equal - // payment amount. + + // Last hop should have zero fee and amount to forward should + // equal payment amount. hop := route.Hops[len(route.Hops)-1] - if hop.Fee != 0 || hop.FeeMsat != 0 { // nolint:staticcheck - ht.Fatalf("route %v hop %v: fee expected 0 got %v (sat) %v (msat)", - i, len(route.Hops)-1, hop.Fee, hop.FeeMsat) // nolint:staticcheck + if hop.Fee != 0 || hop.FeeMsat != 0 { + ht.Fatalf("route %v hop %v: fee expected 0 got %v "+ + "(sat) %v (msat)", i, len(route.Hops)-1, + hop.Fee, hop.FeeMsat) } - if hop.AmtToForward != hop.AmtToForwardMsat/mSat { // nolint:staticcheck - ht.Fatalf("route %v hop %v: amt to forward %v (msat) does not "+ - "round down to %v (sat)", - i, len(route.Hops)-1, hop.AmtToForwardMsat, hop.AmtToForward) // nolint:staticcheck + if hop.AmtToForward != hop.AmtToForwardMsat/mSat { + ht.Fatalf("route %v hop %v: amt to forward %v (msat) "+ + "does not round down to %v (sat)", i, + len(route.Hops)-1, hop.AmtToForwardMsat, + hop.AmtToForward) } if hop.AmtToForwardMsat != paymentAmt*mSat { ht.Fatalf("route %v hop %v: amt to forward in msat "+ - "expected %v got %v", - i, len(route.Hops)-1, paymentAmt*mSat, hop.AmtToForwardMsat) + "expected %v got %v", i, len(route.Hops)-1, + paymentAmt*mSat, hop.AmtToForwardMsat) } }