itest: deprecate createThreeHopNetwork

lntest/itest/lnd_multi-hop_htlc_aggregation_test.go

@@ -30,7 +30,7 @@ func testMultiHopHtlcAggregation(net *lntest.NetworkHarness, t *harnessTest,
 	ctxb := context.Background()
 
 	// First, we'll create a three hop network: Alice -> Bob -> Carol.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, false, c, zeroConf,
 	)
 	defer shutdownAndAssert(net, t, carol)

lntest/itest/lnd_multi-hop_htlc_local_chain_claim_test.go

@@ -28,7 +28,7 @@ func testMultiHopHtlcLocalChainClaim(net *lntest.NetworkHarness, t *harnessTest,
 	// First, we'll create a three hop network: Alice -> Bob -> Carol, with
 	// Carol refusing to actually settle or directly cancel any HTLC's
 	// self.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, false, c, zeroConf,
 	)
 

lntest/itest/lnd_multi-hop_htlc_local_timeout_test.go

@@ -28,7 +28,7 @@ func testMultiHopHtlcLocalTimeout(net *lntest.NetworkHarness, t *harnessTest,
 	// First, we'll create a three hop network: Alice -> Bob -> Carol, with
 	// Carol refusing to actually settle or directly cancel any HTLC's
 	// self.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, true, c, zeroConf,
 	)
 

lntest/itest/lnd_multi-hop_htlc_receiver_chain_claim_test.go

@@ -30,7 +30,7 @@ func testMultiHopReceiverChainClaim(net *lntest.NetworkHarness, t *harnessTest,
 	// First, we'll create a three hop network: Alice -> Bob -> Carol, with
 	// Carol refusing to actually settle or directly cancel any HTLC's
 	// self.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, false, c, zeroConf,
 	)
 

lntest/itest/lnd_multi-hop_htlc_remote_chain_claim_test.go

@@ -28,7 +28,7 @@ func testMultiHopHtlcRemoteChainClaim(net *lntest.NetworkHarness, t *harnessTest
 	// First, we'll create a three hop network: Alice -> Bob -> Carol, with
 	// Carol refusing to actually settle or directly cancel any HTLC's
 	// self.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, false, c, zeroConf,
 	)
 

lntest/itest/lnd_multi-hop_local_force_close_on_chain_htlc_timeout_test.go

@@ -27,7 +27,7 @@ func testMultiHopLocalForceCloseOnChainHtlcTimeout(net *lntest.NetworkHarness,
 	// First, we'll create a three hop network: Alice -> Bob -> Carol, with
 	// Carol refusing to actually settle or directly cancel any HTLC's
 	// self.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, true, c, zeroConf,
 	)
 

lntest/itest/lnd_multi-hop_remote_force_close_on_chain_htlc_timeout_test.go

@@ -29,7 +29,7 @@ func testMultiHopRemoteForceCloseOnChainHtlcTimeout(net *lntest.NetworkHarness,
 	// First, we'll create a three hop network: Alice -> Bob -> Carol, with
 	// Carol refusing to actually settle or directly cancel any HTLC's
 	// self.
-	aliceChanPoint, bobChanPoint, carol := createThreeHopNetwork(
+	aliceChanPoint, bobChanPoint, carol := createThreeHopNetworkOld(
 		t, net, alice, bob, true, c, zeroConf,
 	)
 

lntest/itest/lnd_multi-hop_test.go

@@ -239,7 +239,8 @@ func checkPaymentStatus(node *lntest.HarnessNode, preimage lntypes.Preimage,
 	return nil
 }
 
-func createThreeHopNetwork(t *harnessTest, net *lntest.NetworkHarness,
+// TODO(yy): delete
+func createThreeHopNetworkOld(t *harnessTest, net *lntest.NetworkHarness,
 	alice, bob *lntest.HarnessNode, carolHodl bool, c lnrpc.CommitmentType,
 	zeroConf bool) (
 	*lnrpc.ChannelPoint, *lnrpc.ChannelPoint, *lntest.HarnessNode) {