itest+lntest: stop using pointer to chainhash.Hash
This commit fixes the methods used in `lntest` so they stop using pointers to chainhash.
This commit is contained in:
16 files changed
+99
-93
No files matched your search
@@ -306,7 +306,7 @@ func runPsbtChanFunding(ht *lntest.HarnessTest, carol, dave *node.HarnessNode,
|
||||
|
||||
txHash := finalTx.TxHash()
|
||||
block := ht.MineBlocksAndAssertNumTxes(6, 1)[0]
|
||||
ht.AssertTxInBlock(block, &txHash)
|
||||
ht.AssertTxInBlock(block, txHash)
|
||||
ht.AssertTopologyChannelOpen(carol, chanPoint)
|
||||
ht.AssertTopologyChannelOpen(carol, chanPoint2)
|
||||
|
||||
@@ -481,7 +481,7 @@ func runPsbtChanFundingExternal(ht *lntest.HarnessTest, carol,
|
||||
// Now we can mine a block to get the transaction confirmed, then wait
|
||||
// for the new channel to be propagated through the network.
|
||||
block := ht.MineBlocksAndAssertNumTxes(6, 1)[0]
|
||||
ht.AssertTxInBlock(block, &txHash)
|
||||
ht.AssertTxInBlock(block, txHash)
|
||||
ht.AssertTopologyChannelOpen(carol, chanPoint)
|
||||
ht.AssertTopologyChannelOpen(carol, chanPoint2)
|
||||
|
||||
@@ -638,7 +638,7 @@ func runPsbtChanFundingSingleStep(ht *lntest.HarnessTest, carol,
|
||||
|
||||
txHash := finalTx.TxHash()
|
||||
block := ht.MineBlocksAndAssertNumTxes(6, 1)[0]
|
||||
ht.AssertTxInBlock(block, &txHash)
|
||||
ht.AssertTxInBlock(block, txHash)
|
||||
ht.AssertTopologyChannelOpen(carol, chanPoint)
|
||||
|
||||
// Next, to make sure the channel functions as normal, we'll make some
|
||||
@@ -1337,7 +1337,7 @@ func extractPublishAndMine(ht *lntest.HarnessTest, node *node.HarnessNode,
|
||||
// Mine one block which should contain two transactions.
|
||||
block := ht.MineBlocksAndAssertNumTxes(1, 1)[0]
|
||||
txHash := finalTx.TxHash()
|
||||
ht.AssertTxInBlock(block, &txHash)
|
||||
ht.AssertTxInBlock(block, txHash)
|
||||
|
||||
return finalTx
|
||||
}
|
||||
@@ -1443,8 +1443,8 @@ func assertPsbtSpend(ht *lntest.HarnessTest, alice *node.HarnessNode,
|
||||
block := ht.MineBlocksAndAssertNumTxes(1, 2)[0]
|
||||
firstTxHash := prevTx.TxHash()
|
||||
secondTxHash := finalTx.TxHash()
|
||||
ht.AssertTxInBlock(block, &firstTxHash)
|
||||
ht.AssertTxInBlock(block, &secondTxHash)
|
||||
ht.AssertTxInBlock(block, firstTxHash)
|
||||
ht.AssertTxInBlock(block, secondTxHash)
|
||||
}
|
||||
|
||||
// assertPsbtFundSignSpend funds a PSBT from the internal wallet and then
|
||||
@@ -1807,7 +1807,7 @@ func testPsbtChanFundingWithUnstableUtxos(ht *lntest.HarnessTest) {
|
||||
|
||||
txHash := finalTx.TxHash()
|
||||
block := ht.MineBlocksAndAssertNumTxes(1, 1)[0]
|
||||
ht.AssertTxInBlock(block, &txHash)
|
||||
ht.AssertTxInBlock(block, txHash)
|
||||
|
||||
// Now we do the same but instead use preselected utxos to verify that
|
||||
// these utxos respects the utxo restrictions on sweeper unconfirmed
|
||||
@@ -1951,5 +1951,5 @@ func testPsbtChanFundingWithUnstableUtxos(ht *lntest.HarnessTest) {
|
||||
|
||||
txHash = finalTx.TxHash()
|
||||
block = ht.MineBlocksAndAssertNumTxes(1, 1)[0]
|
||||
ht.AssertTxInBlock(block, &txHash)
|
||||
ht.AssertTxInBlock(block, txHash)
|
||||
}
|
||||
Reference in new issue
Block a user