multi: update test handling of tapscript preimages

Author: jharveyb

address/address_test.go

@@ -48,11 +48,15 @@ func randAddress(t *testing.T, net *ChainParams, v Version, groupPubKey,
 		amount = test.RandInt[uint64]()
 	}
 
-	var tapscriptSibling *commitment.TapscriptPreimage
+	var (
+		tapscriptSibling *commitment.TapscriptPreimage
+		err              error
+	)
 	if sibling {
-		tapscriptSibling = commitment.NewPreimageFromLeaf(
+		tapscriptSibling, err = commitment.NewPreimageFromLeaf(
 			txscript.NewBaseTapLeaf([]byte("not a valid script")),
 		)
+		require.NoError(t, err)
 	}
 
 	scriptKey := *pubKey

address/mock.go

@@ -70,9 +70,11 @@ func RandAddr(t testing.TB, params *ChainParams,
 		groupPubKey = &groupInfo.GroupPubKey
 		groupWitness = groupInfo.Witness
 
-		tapscriptSibling = commitment.NewPreimageFromLeaf(
+		var err error
+		tapscriptSibling, err = commitment.NewPreimageFromLeaf(
 			txscript.NewBaseTapLeaf([]byte("not a valid script")),
 		)
+		require.NoError(t, err)
 	}
 
 	tapAddr, err := New(

itest/psbt_test.go

@@ -744,8 +744,9 @@ func testPsbtInteractiveTapscriptSibling(t *harnessTest) {
 	preImage := []byte("hash locks are cool")
 	siblingLeaf := test.ScriptHashLock(t.t, preImage)
 
-	preimage := commitment.NewPreimageFromLeaf(siblingLeaf)
-	vPkt.Outputs[0].AnchorOutputTapscriptSibling = preimage
+	siblingPreimage, err := commitment.NewPreimageFromLeaf(siblingLeaf)
+	require.NoError(t.t, err)
+	vPkt.Outputs[0].AnchorOutputTapscriptSibling = siblingPreimage
 
 	// Next, we'll attempt to complete a transfer with PSBTs from alice to
 	// bob, using the partial amount.

itest/round_trip_send_test.go

@@ -54,7 +54,8 @@ func testRoundTripSend(t *harnessTest) {
 
 	hashLockPreimage := []byte("hash locks are cool")
 	scriptLeaf := test.ScriptHashLock(t.t, hashLockPreimage)
-	sibling := commitment.NewPreimageFromLeaf(scriptLeaf)
+	sibling, err := commitment.NewPreimageFromLeaf(scriptLeaf)
+	require.NoError(t.t, err)
 	siblingBytes, _, err := commitment.MaybeEncodeTapscriptPreimage(sibling)
 	require.NoError(t.t, err)
 

proof/mock.go

@@ -76,8 +76,10 @@ func RandProof(t testing.TB, genesis asset.Genesis,
 
 	leaf1 := txscript.NewBaseTapLeaf([]byte{1})
 	leaf2 := txscript.NewBaseTapLeaf([]byte{2})
-	testLeafPreimage := commitment.NewPreimageFromLeaf(leaf1)
-	testLeafPreimage2 := commitment.NewPreimageFromLeaf(leaf2)
+	testLeafPreimage, err := commitment.NewPreimageFromLeaf(leaf1)
+	require.NoError(t, err)
+	testLeafPreimage2, err := commitment.NewPreimageFromLeaf(leaf2)
+	require.NoError(t, err)
 	testBranchPreimage := commitment.NewPreimageFromBranch(
 		txscript.NewTapBranch(leaf1, leaf2),
 	)
@@ -112,7 +114,7 @@ func RandProof(t testing.TB, genesis asset.Genesis,
 				InternalKey:     test.RandPubKey(t),
 				CommitmentProof: nil,
 				TapscriptProof: &TapscriptProof{
-					TapPreimage1: testBranchPreimage,
+					TapPreimage1: &testBranchPreimage,
 					TapPreimage2: testLeafPreimage2,
 					Bip86:        true,
 				},

proof/proof_test.go

@@ -371,9 +371,12 @@ func TestGenesisProofVerification(t *testing.T) {
 	scriptInternalKey := test.RandPrivKey(t).PubKey()
 	leaf1 := test.ScriptHashLock(t, []byte("foobar"))
 	leaf2 := test.ScriptSchnorrSig(t, scriptInternalKey)
+	testLeafPreimage, err := commitment.NewPreimageFromLeaf(leaf1)
+	require.NoError(t, err)
 
 	// The order doesn't matter here as they are sorted before hashing.
 	branch := txscript.NewTapBranch(leaf1, leaf2)
+	testBranchPreimage := commitment.NewPreimageFromBranch(branch)
 	amount := uint64(5000)
 
 	testCases := []struct {
@@ -402,20 +405,16 @@ func TestGenesisProofVerification(t *testing.T) {
 			assetVersion: asset.V1,
 		},
 		{
-			name:      "collectible with leaf preimage",
-			assetType: asset.Collectible,
-			tapscriptPreimage: commitment.NewPreimageFromLeaf(
-				leaf1,
-			),
-			noMetaHash: true,
+			name:              "collectible with leaf preimage",
+			assetType:         asset.Collectible,
+			tapscriptPreimage: testLeafPreimage,
+			noMetaHash:        true,
 		},
 		{
-			name:      "collectible with branch preimage",
-			assetType: asset.Collectible,
-			tapscriptPreimage: commitment.NewPreimageFromBranch(
-				branch,
-			),
-			noMetaHash: true,
+			name:              "collectible with branch preimage",
+			assetType:         asset.Collectible,
+			tapscriptPreimage: &testBranchPreimage,
+			noMetaHash:        true,
 		},
 		{
 			name:       "normal genesis",
@@ -431,22 +430,18 @@ func TestGenesisProofVerification(t *testing.T) {
 			assetVersion: asset.V1,
 		},
 		{
-			name:      "normal with leaf preimage",
-			assetType: asset.Normal,
-			amount:    &amount,
-			tapscriptPreimage: commitment.NewPreimageFromLeaf(
-				leaf1,
-			),
-			noMetaHash: true,
+			name:              "normal with leaf preimage",
+			assetType:         asset.Normal,
+			amount:            &amount,
+			tapscriptPreimage: testLeafPreimage,
+			noMetaHash:        true,
 		},
 		{
-			name:      "normal with branch preimage",
-			assetType: asset.Normal,
-			amount:    &amount,
-			tapscriptPreimage: commitment.NewPreimageFromBranch(
-				branch,
-			),
-			noMetaHash: true,
+			name:              "normal with branch preimage",
+			assetType:         asset.Normal,
+			amount:            &amount,
+			tapscriptPreimage: &testBranchPreimage,
+			noMetaHash:        true,
 		},
 		{
 			name:      "normal asset with a meta reveal",

tappsbt/mock.go

@@ -80,7 +80,8 @@ func RandPacket(t testing.TB) *VPacket {
 		LeafVersion: txscript.BaseLeafVersion,
 		Script:      []byte("not a valid script"),
 	}
-	testPreimage1 := commitment.NewPreimageFromLeaf(leaf1)
+	testPreimage1, err := commitment.NewPreimageFromLeaf(leaf1)
+	require.NoError(t, err)
 	testPreimage2 := commitment.NewPreimageFromBranch(
 		txscript.NewTapBranch(leaf1, leaf1),
 	)
@@ -155,7 +156,7 @@ func RandPacket(t testing.TB) *VPacket {
 			AnchorOutputTaprootBip32Derivation: trBip32Derivations,
 			Asset:                              testOutputAsset,
 			ScriptKey:                          testOutputAsset.ScriptKey,
-			AnchorOutputTapscriptSibling:       testPreimage2,
+			AnchorOutputTapscriptSibling:       &testPreimage2,
 		}},
 		ChainParams: testParams,
 	}

tapsend/send_test.go

@@ -1070,18 +1070,19 @@ var createOutputCommitmentsTestCases = []testCase{{
 		)
 		tpl := pkt.Outputs[1]
 
-		testPreimage := commitment.NewPreimageFromLeaf(
+		testPreimage, err := commitment.NewPreimageFromLeaf(
 			txscript.TapLeaf{
 				LeafVersion: txscript.BaseLeafVersion,
 				Script:      []byte("not a valid script"),
 			},
 		)
+		require.NoError(t, err)
 		pkt.Outputs = append(pkt.Outputs, &tappsbt.VOutput{
 			AnchorOutputIndex:            tpl.AnchorOutputIndex,
 			AnchorOutputTapscriptSibling: testPreimage,
 		})
 
-		_, err := tapsend.CreateOutputCommitments(nil, pkt, nil)
+		_, err = tapsend.CreateOutputCommitments(nil, pkt, nil)
 		return err
 	},
 	err: tapsend.ErrInvalidAnchorInfo,
@@ -2171,9 +2172,10 @@ func TestPayToAddrScript(t *testing.T) {
 	)
 
 	// And now the same with an address that has a tapscript sibling.
-	sibling := commitment.NewPreimageFromLeaf(txscript.NewBaseTapLeaf(
+	sibling, err := commitment.NewPreimageFromLeaf(txscript.NewBaseTapLeaf(
 		[]byte("not a valid script"),
 	))
+	require.NoError(t, err)
 	addr2, err := address.New(
 		address.V0, gen, nil, nil, *recipientScriptKey.PubKey,
 		*internalKey, sendAmt, sibling, &address.RegressionNetTap,