From 86779fb6a52ebdd28838003aeea4558ccc42d276 Mon Sep 17 00:00:00 2001
From: yyforyongyu <yy2452@columbia.edu>
Date: Thu, 24 Sep 2020 20:51:58 +0800
Subject: [PATCH] itest: fix code lint

---
 lntest/itest/lnd_multi-hop-error-propagation_test.go | 1 -
 lntest/itest/lnd_test.go                             | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lntest/itest/lnd_multi-hop-error-propagation_test.go b/lntest/itest/lnd_multi-hop-error-propagation_test.go
index a94c3ebe..bb386b07 100644
--- a/lntest/itest/lnd_multi-hop-error-propagation_test.go
+++ b/lntest/itest/lnd_multi-hop-error-propagation_test.go
@@ -197,7 +197,6 @@ out:
 	// an unknown payment hash.
 	// TODO(roasbeef): return failure response rather than failing entire
 	// stream on payment error.
-	ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
 	sendReq := &routerrpc.SendPaymentRequest{
 		PaymentHash:    makeFakePayHash(t),
 		Dest:           carol.PubKey[:],
diff --git a/lntest/itest/lnd_test.go b/lntest/itest/lnd_test.go
index 9755f8b4..b2163141 100644
--- a/lntest/itest/lnd_test.go
+++ b/lntest/itest/lnd_test.go
@@ -1097,7 +1097,7 @@ func channelCommitType(node *lntest.HarnessNode,
 }
 
 // assertChannelBalanceResp makes a ChannelBalance request and checks the
-// returned reponse matches the expected.
+// returned response matches the expected.
 func assertChannelBalanceResp(t *harnessTest,
 	node *lntest.HarnessNode, expected *lnrpc.ChannelBalanceResponse) {
 
@@ -11202,10 +11202,7 @@ func testSwitchCircuitPersistence(net *lntest.NetworkHarness, t *harnessTest) {
 	// the nodes in the network.
 	err = wait.Predicate(func() bool {
 		predErr = assertNumActiveHtlcs(nodes, 0)
-		if predErr != nil {
-			return false
-		}
-		return true
+		return predErr == nil
 
 	}, time.Second*15)
 	if err != nil {