Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit fa8de5b

Browse files
muXxermuXxer
committed
Simplify tx builder options in testsuite
1 parent fed028a commit fa8de5b

File tree

2 files changed

+36
-35
lines changed

2 files changed

+36
-35
lines changed

Diff for: ‎pkg/testsuite/mock/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func MaxBlockManaCost(protocolParameters iotago.ProtocolParameters) iotago.Mana
4646

4747
// TransactionBuilder options
4848

49-
func WithInputs(inputs utxoledger.Outputs) options.Option[builder.TransactionBuilder] {
49+
func WithInputs(inputs ...*utxoledger.Output) options.Option[builder.TransactionBuilder] {
5050
return func(txBuilder *builder.TransactionBuilder) {
5151
for _, input := range inputs {
5252
switch input.OutputType() {
@@ -124,7 +124,7 @@ func WithRewardInput(input *iotago.RewardInput, mana iotago.Mana) options.Option
124124
}
125125
}
126126

127-
func WithOutputs(outputs iotago.Outputs[iotago.Output]) options.Option[builder.TransactionBuilder] {
127+
func WithOutputs(outputs ...iotago.Output) options.Option[builder.TransactionBuilder] {
128128
return func(txBuilder *builder.TransactionBuilder) {
129129
for _, output := range outputs {
130130
txBuilder.AddOutput(output)

Diff for: ‎pkg/testsuite/mock/wallet_transactions.go

+34-33
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ func (w *Wallet) CreateAccountFromInput(transactionName string, inputName string
4747
WithCommitmentInput(&iotago.CommitmentInput{
4848
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
4949
}),
50-
WithInputs(utxoledger.Outputs{input}),
51-
WithOutputs(outputStates),
50+
WithInputs(input),
51+
WithOutputs(outputStates...),
5252
)
5353

5454
// register the outputs in the recipient wallet (so wallet doesn't have to scan for outputs on its addresses)
@@ -93,8 +93,8 @@ func (w *Wallet) CreateDelegationFromInput(transactionName string, inputName str
9393
WithCommitmentInput(&iotago.CommitmentInput{
9494
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
9595
}),
96-
WithInputs(utxoledger.Outputs{input}),
97-
WithOutputs(outputStates),
96+
WithInputs(input),
97+
WithOutputs(outputStates...),
9898
WithAllotAllManaToAccount(w.currentSlot, w.BlockIssuer.AccountID),
9999
)
100100

@@ -165,8 +165,8 @@ func (w *Wallet) DelayedClaimingTransition(transactionName string, inputName str
165165
WithCommitmentInput(&iotago.CommitmentInput{
166166
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
167167
}),
168-
WithInputs(utxoledger.Outputs{input}),
169-
WithOutputs(iotago.Outputs[iotago.Output]{delegationOutput}),
168+
WithInputs(input),
169+
WithOutputs(delegationOutput),
170170
)
171171

172172
return signedTransaction
@@ -195,7 +195,7 @@ func (w *Wallet) TransitionAccount(transactionName string, inputName string, opt
195195
WithCommitmentInput(&iotago.CommitmentInput{
196196
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
197197
}),
198-
WithOutputs(iotago.Outputs[iotago.Output]{accountOutput}),
198+
WithOutputs(accountOutput),
199199
)
200200

201201
return signedTransaction
@@ -226,7 +226,7 @@ func (w *Wallet) DestroyAccount(transactionName string, inputName string) *iotag
226226
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
227227
}),
228228
WithAccountInput(input),
229-
WithOutputs(destructionOutputs),
229+
WithOutputs(destructionOutputs...),
230230
)
231231

232232
return signedTransaction
@@ -256,8 +256,8 @@ func (w *Wallet) CreateImplicitAccountFromInput(transactionName string, inputNam
256256

257257
signedTransaction := w.createSignedTransactionWithOptions(
258258
transactionName,
259-
WithInputs(utxoledger.Outputs{input}),
260-
WithOutputs(iotago.Outputs[iotago.Output]{implicitAccountOutput, remainderBasicOutput}),
259+
WithInputs(input),
260+
WithOutputs(implicitAccountOutput, remainderBasicOutput),
261261
)
262262

263263
// register the outputs in the recipient wallet (so wallet doesn't have to scan for outputs on its addresses)
@@ -294,8 +294,8 @@ func (w *Wallet) TransitionImplicitAccountToAccountOutput(transactionName string
294294
WithCommitmentInput(&iotago.CommitmentInput{
295295
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
296296
}),
297-
WithInputs(utxoledger.Outputs{input}),
298-
WithOutputs(iotago.Outputs[iotago.Output]{accountOutput}),
297+
WithInputs(input),
298+
WithOutputs(accountOutput),
299299
WithAllotAllManaToAccount(w.currentSlot, implicitAccountID),
300300
)
301301

@@ -339,8 +339,8 @@ func (w *Wallet) CreateBasicOutputsEquallyFromInput(transactionName string, outp
339339

340340
signedTransaction := w.createSignedTransactionWithOptions(
341341
transactionName,
342-
WithInputs(utxoledger.Outputs{inputState}),
343-
WithOutputs(outputStates),
342+
WithInputs(inputState),
343+
WithOutputs(outputStates...),
344344
)
345345

346346
return signedTransaction
@@ -365,7 +365,7 @@ func (w *Wallet) RemoveFeatureFromAccount(featureType iotago.FeatureType, transa
365365
WithCommitmentInput(&iotago.CommitmentInput{
366366
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
367367
}),
368-
WithOutputs(iotago.Outputs[iotago.Output]{accountOutput}),
368+
WithOutputs(accountOutput),
369369
)
370370

371371
return signedTransaction
@@ -393,8 +393,8 @@ func (w *Wallet) SendFundsToWallet(transactionName string, receiverWallet *Walle
393393

394394
signedTransaction := w.createSignedTransactionWithOptions(
395395
transactionName,
396-
WithInputs(inputStates),
397-
WithOutputs(iotago.Outputs[iotago.Output]{targetOutput}),
396+
WithInputs(inputStates...),
397+
WithOutputs(targetOutput),
398398
)
399399

400400
receiverWallet.registerOutputs(transactionName, signedTransaction.Transaction)
@@ -425,8 +425,8 @@ func (w *Wallet) SendFundsToAccount(transactionName string, accountID iotago.Acc
425425

426426
signedTransaction := w.createSignedTransactionWithOptions(
427427
transactionName,
428-
WithInputs(inputStates),
429-
WithOutputs(iotago.Outputs[iotago.Output]{targetOutput}),
428+
WithInputs(inputStates...),
429+
WithOutputs(targetOutput),
430430
)
431431

432432
w.registerOutputs(transactionName, signedTransaction.Transaction)
@@ -465,14 +465,14 @@ func (w *Wallet) SendFundsFromAccount(transactionName string, accountOutputName
465465
}}
466466
signedTransaction := w.createSignedTransactionWithOptions(
467467
transactionName,
468-
WithInputs(inputStates),
468+
WithInputs(inputStates...),
469469
WithCommitmentInput(&iotago.CommitmentInput{
470470
CommitmentID: commitmentID,
471471
}),
472472
WithBlockIssuanceCreditInput(&iotago.BlockIssuanceCreditInput{
473473
AccountID: accountOutput.AccountID,
474474
}),
475-
WithOutputs(targetOutputs),
475+
WithOutputs(targetOutputs...),
476476
)
477477

478478
w.registerOutputs(transactionName, signedTransaction.Transaction)
@@ -522,7 +522,7 @@ func (w *Wallet) ClaimValidatorRewards(transactionName string, inputName string)
522522
WithCommitmentInput(&iotago.CommitmentInput{
523523
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
524524
}),
525-
WithOutputs(iotago.Outputs[iotago.Output]{accountOutput}),
525+
WithOutputs(accountOutput),
526526
)
527527

528528
return signedTransaction
@@ -561,8 +561,8 @@ func (w *Wallet) AllotManaFromInputs(transactionName string, allotments iotago.A
561561
signedTransaction := w.createSignedTransactionWithOptions(
562562
transactionName,
563563
WithAllotments(allotments),
564-
WithInputs(inputStates),
565-
WithOutputs(outputStates),
564+
WithInputs(inputStates...),
565+
WithOutputs(outputStates...),
566566
)
567567

568568
w.registerOutputs(transactionName, signedTransaction.Transaction)
@@ -614,15 +614,15 @@ func (w *Wallet) ClaimDelegatorRewards(transactionName string, inputName string)
614614

615615
signedTransaction := w.createSignedTransactionWithOptions(
616616
transactionName,
617-
WithInputs(utxoledger.Outputs{input}),
617+
WithInputs(input),
618618
WithRewardInput(
619619
&iotago.RewardInput{Index: 0},
620620
rewardMana,
621621
),
622622
WithCommitmentInput(&iotago.CommitmentInput{
623623
CommitmentID: w.Node.Protocol.Engines.Main.Get().Storage.Settings().LatestCommitment().Commitment().MustID(),
624624
}),
625-
WithOutputs(outputStates),
625+
WithOutputs(outputStates...),
626626
)
627627

628628
return signedTransaction
@@ -643,7 +643,7 @@ func (w *Wallet) AllotManaToWallet(transactionName string, inputName string, rec
643643

644644
signedTransaction := w.createSignedTransactionWithOptions(
645645
transactionName,
646-
WithInputs(utxoledger.Outputs{input}),
646+
WithInputs(input),
647647
WithAllotAllManaToAccount(w.currentSlot, recipientWallet.BlockIssuer.AccountID),
648648
)
649649

@@ -659,8 +659,8 @@ func (w *Wallet) CreateNFTFromInput(transactionName string, inputName string, op
659659

660660
return w.createSignedTransactionWithOptions(
661661
transactionName,
662-
WithInputs(utxoledger.Outputs{input}),
663-
WithOutputs(iotago.Outputs[iotago.Output]{nftOutput}),
662+
WithInputs(input),
663+
WithOutputs(nftOutput),
664664
WithAllotAllManaToAccount(w.currentSlot, w.BlockIssuer.AccountID),
665665
)
666666
}
@@ -696,8 +696,8 @@ func (w *Wallet) CreateNativeTokenFromInput(transactionName string, inputName st
696696

697697
return w.createSignedTransactionWithOptions(
698698
transactionName,
699-
WithInputs(utxoledger.Outputs{accountOutput, input}),
700-
WithOutputs(iotago.Outputs[iotago.Output]{accTransitionOutput, foundryOutput}),
699+
WithInputs(accountOutput, input),
700+
WithOutputs(accTransitionOutput, foundryOutput),
701701
WithBlockIssuanceCreditInput(&iotago.BlockIssuanceCreditInput{
702702
AccountID: accID,
703703
}),
@@ -723,8 +723,9 @@ func (w *Wallet) TransitionNFTWithTransactionOpts(transactionName string, inputN
723723

724724
return w.createSignedTransactionWithOptions(
725725
transactionName,
726-
append(opts, WithInputs(utxoledger.Outputs{input}),
727-
WithOutputs(iotago.Outputs[iotago.Output]{nftOutput}),
726+
append(opts,
727+
WithInputs(input),
728+
WithOutputs(nftOutput),
728729
WithAllotAllManaToAccount(w.currentSlot, w.BlockIssuer.AccountID))...,
729730
)
730731
}

0 commit comments

Comments
 (0)