input+lnwallet: refactor select methods in input to use ChannelParty

This commit is contained in:
Keagan McClelland
2024-07-30 16:18:09 -07:00
parent 1a5b5c5f62
commit 3a15085014
4 changed files with 22 additions and 18 deletions

View File

@@ -13,6 +13,7 @@ import (
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/stretchr/testify/require"
)
@@ -1073,7 +1074,7 @@ var witnessSizeTests = []witnessSizeTest{
htlcScriptTree, err := input.SenderHTLCScriptTaproot(
senderKey.PubKey(), receiverKey.PubKey(),
revokeKey.PubKey(), payHash[:], false,
revokeKey.PubKey(), payHash[:], lntypes.Remote,
)
require.NoError(t, err)
@@ -1115,7 +1116,7 @@ var witnessSizeTests = []witnessSizeTest{
htlcScriptTree, err := input.ReceiverHTLCScriptTaproot(
testCLTVExpiry, senderKey.PubKey(),
receiverKey.PubKey(), revokeKey.PubKey(),
payHash[:], false,
payHash[:], lntypes.Remote,
)
require.NoError(t, err)
@@ -1157,7 +1158,7 @@ var witnessSizeTests = []witnessSizeTest{
htlcScriptTree, err := input.ReceiverHTLCScriptTaproot(
testCLTVExpiry, senderKey.PubKey(),
receiverKey.PubKey(), revokeKey.PubKey(),
payHash[:], false,
payHash[:], lntypes.Remote,
)
require.NoError(t, err)
@@ -1203,7 +1204,7 @@ var witnessSizeTests = []witnessSizeTest{
htlcScriptTree, err := input.SenderHTLCScriptTaproot(
senderKey.PubKey(), receiverKey.PubKey(),
revokeKey.PubKey(), payHash[:], false,
revokeKey.PubKey(), payHash[:], lntypes.Remote,
)
require.NoError(t, err)
@@ -1263,7 +1264,7 @@ var witnessSizeTests = []witnessSizeTest{
htlcScriptTree, err := input.SenderHTLCScriptTaproot(
senderKey.PubKey(), receiverKey.PubKey(),
revokeKey.PubKey(), payHash[:], false,
revokeKey.PubKey(), payHash[:], lntypes.Remote,
)
require.NoError(t, err)
@@ -1309,7 +1310,7 @@ var witnessSizeTests = []witnessSizeTest{
htlcScriptTree, err := input.ReceiverHTLCScriptTaproot(
testCLTVExpiry, senderKey.PubKey(),
receiverKey.PubKey(), revokeKey.PubKey(),
payHash[:], false,
payHash[:], lntypes.Remote,
)
require.NoError(t, err)
@@ -1394,7 +1395,8 @@ func genTimeoutTx(t *testing.T,
)
if chanType.IsTaproot() {
tapscriptTree, err = input.SenderHTLCScriptTaproot(
testPubkey, testPubkey, testPubkey, testHash160, false,
testPubkey, testPubkey, testPubkey, testHash160,
lntypes.Remote,
)
require.NoError(t, err)
@@ -1463,7 +1465,7 @@ func genSuccessTx(t *testing.T, chanType channeldb.ChannelType) *wire.MsgTx {
if chanType.IsTaproot() {
tapscriptTree, err = input.ReceiverHTLCScriptTaproot(
testCLTVExpiry, testPubkey, testPubkey, testPubkey,
testHash160, false,
testHash160, lntypes.Remote,
)
require.NoError(t, err)