Skip to content

Commit 171f7ae

Browse files
gijswijsguggero
authored andcommitted
multi: remove witness parameter from 'NewAltLeaf`
Since we're only ever passing nil (and we use the previous witness in the script/burn key), we just remove the witness parameter completely.
1 parent 5815dcf commit 171f7ae

File tree

5 files changed

+593
-716
lines changed

5 files changed

+593
-716
lines changed

asset/asset.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -1914,9 +1914,7 @@ type AltLeaf[T any] interface {
19141914
}
19151915

19161916
// NewAltLeaf instantiates a new valid AltLeaf.
1917-
func NewAltLeaf(key ScriptKey, keyVersion ScriptVersion,
1918-
prevWitness []Witness) (*Asset, error) {
1919-
1917+
func NewAltLeaf(key ScriptKey, keyVersion ScriptVersion) (*Asset, error) {
19201918
if key.PubKey == nil {
19211919
return nil, fmt.Errorf("script key must be non-nil")
19221920
}
@@ -1927,7 +1925,7 @@ func NewAltLeaf(key ScriptKey, keyVersion ScriptVersion,
19271925
Amount: 0,
19281926
LockTime: 0,
19291927
RelativeLockTime: 0,
1930-
PrevWitnesses: prevWitness,
1928+
PrevWitnesses: nil,
19311929
SplitCommitmentRoot: nil,
19321930
GroupKey: nil,
19331931
ScriptKey: key,

asset/mock.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -678,12 +678,9 @@ func RandAssetWithValues(t testing.TB, genesis Genesis, groupKey *GroupKey,
678678

679679
// RandAltLeaf generates a random Asset that is a valid AltLeaf.
680680
func RandAltLeaf(t testing.TB) *Asset {
681-
randWitness := []Witness{
682-
{TxWitness: test.RandTxWitnesses(t)},
683-
}
684681
randKey := RandScriptKey(t)
685682
randVersion := ScriptVersion(test.RandInt[uint16]())
686-
randLeaf, err := NewAltLeaf(randKey, randVersion, randWitness)
683+
randLeaf, err := NewAltLeaf(randKey, randVersion)
687684
require.NoError(t, err)
688685
require.NoError(t, randLeaf.ValidateAltLeaf())
689686

0 commit comments

Comments
 (0)