From 85210b947fd9d742b018795949a7f913af7b9540 Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Mon, 25 Jul 2022 19:01:34 +0800 Subject: [PATCH] itest: deprecate `deriveFundingShim` --- lntest/itest/lnd_channel_backup_test.go | 2 +- lntest/itest/lnd_funding_test.go | 7 ++++--- lntest/itest/lnd_multi-hop_test.go | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lntest/itest/lnd_channel_backup_test.go b/lntest/itest/lnd_channel_backup_test.go index 9895d9dbb..52191918c 100644 --- a/lntest/itest/lnd_channel_backup_test.go +++ b/lntest/itest/lnd_channel_backup_test.go @@ -1077,7 +1077,7 @@ func testChanRestoreScenario(t *harnessTest, net *lntest.NetworkHarness, require.NoError(t.t, err) thawHeight := uint32(minerHeight + 144) - fundingShim, _, _ = deriveFundingShim( + fundingShim, _, _ = deriveFundingShimOld( net, t, from, to, chanAmt, thawHeight, true, ) } diff --git a/lntest/itest/lnd_funding_test.go b/lntest/itest/lnd_funding_test.go index d6717b026..37b79c63c 100644 --- a/lntest/itest/lnd_funding_test.go +++ b/lntest/itest/lnd_funding_test.go @@ -505,7 +505,7 @@ func testExternalFundingChanPoint(net *lntest.NetworkHarness, t *harnessTest) { // a transaction that will never be published. const thawHeight uint32 = 10 const chanSize = funding.MaxBtcFundingAmount - fundingShim1, chanPoint1, _ := deriveFundingShim( + fundingShim1, chanPoint1, _ := deriveFundingShimOld( net, t, carol, dave, chanSize, thawHeight, false, ) _ = openChannelStream( @@ -521,7 +521,7 @@ func testExternalFundingChanPoint(net *lntest.NetworkHarness, t *harnessTest) { // externally funded, we should still be able to open another one. Let's // do exactly that now. For this one we publish the transaction so we // can mine it later. - fundingShim2, chanPoint2, _ := deriveFundingShim( + fundingShim2, chanPoint2, _ := deriveFundingShimOld( net, t, carol, dave, chanSize, thawHeight, true, ) @@ -748,7 +748,8 @@ func testChannelFundingPersistence(net *lntest.NetworkHarness, t *harnessTest) { // deriveFundingShim creates a channel funding shim by deriving the necessary // keys on both sides. -func deriveFundingShim(net *lntest.NetworkHarness, t *harnessTest, +// TODO(yy): remove. +func deriveFundingShimOld(net *lntest.NetworkHarness, t *harnessTest, carol, dave *lntest.HarnessNode, chanSize btcutil.Amount, thawHeight uint32, publish bool) (*lnrpc.FundingShim, *lnrpc.ChannelPoint, *chainhash.Hash) { diff --git a/lntest/itest/lnd_multi-hop_test.go b/lntest/itest/lnd_multi-hop_test.go index 86f215bd8..180d0aa01 100644 --- a/lntest/itest/lnd_multi-hop_test.go +++ b/lntest/itest/lnd_multi-hop_test.go @@ -261,7 +261,7 @@ func createThreeHopNetwork(t *harnessTest, net *lntest.NetworkHarness, _, minerHeight, err := net.Miner.Client.GetBestBlock() require.NoError(t.t, err) thawHeight = uint32(minerHeight + 144) - aliceFundingShim, _, _ = deriveFundingShim( + aliceFundingShim, _, _ = deriveFundingShimOld( net, t, alice, bob, chanAmt, thawHeight, true, ) } @@ -338,7 +338,7 @@ func createThreeHopNetwork(t *harnessTest, net *lntest.NetworkHarness, // open, our topology looks like: A -> B -> C. var bobFundingShim *lnrpc.FundingShim if c == lnrpc.CommitmentType_SCRIPT_ENFORCED_LEASE { - bobFundingShim, _, _ = deriveFundingShim( + bobFundingShim, _, _ = deriveFundingShimOld( net, t, bob, carol, chanAmt, thawHeight, true, ) }