Skip to content

Commit

Permalink
rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
evlekht committed Oct 2, 2023
1 parent 1ce444d commit b80ea2e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions vms/platformvm/txs/executor/camino_tx_executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5345,7 +5345,7 @@ func TestCaminoStandardTxExecutorMultisigAliasTx(t *testing.T) {
expectedErr error
}{
"Add nested alias": {
state: func(c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
state: func(t *testing.T, c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
s := state.NewMockDiff(c)
s.EXPECT().GetMultisigAlias(msigAliasOwners.Addrs[0]).Return(&multisig.AliasWithNonce{}, nil)
return s
Expand Down Expand Up @@ -5373,7 +5373,7 @@ func TestCaminoStandardTxExecutorMultisigAliasTx(t *testing.T) {
"Updating alias which does not exist": {
state: func(t *testing.T, c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
s := state.NewMockDiff(c)
expectGetMultisigAliases(s, msigAliasOwners.Addrs, nil)
expectGetMultisigAliases(t, s, msigAliasOwners.Addrs, nil)
s.EXPECT().GetMultisigAlias(msigAlias.ID).Return(nil, database.ErrNotFound)
return s
},
Expand All @@ -5397,7 +5397,7 @@ func TestCaminoStandardTxExecutorMultisigAliasTx(t *testing.T) {
"Updating existing alias with less signatures than threshold": {
state: func(t *testing.T, c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
s := state.NewMockDiff(c)
expectGetMultisigAliases(s, msigAliasOwners.Addrs, nil)
expectGetMultisigAliases(t, s, msigAliasOwners.Addrs, nil)
s.EXPECT().GetMultisigAlias(msigAlias.ID).Return(msigAlias, nil)
expectVerifyMultisigPermission(t, s, []ids.ShortID{
msigAliasOwners.Addrs[0],
Expand Down Expand Up @@ -5425,7 +5425,7 @@ func TestCaminoStandardTxExecutorMultisigAliasTx(t *testing.T) {
"OK, update existing alias": {
state: func(t *testing.T, c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
s := state.NewMockDiff(c)
expectGetMultisigAliases(s, msigAliasOwners.Addrs, nil)
expectGetMultisigAliases(t, s, msigAliasOwners.Addrs, nil)
s.EXPECT().GetMultisigAlias(msigAlias.ID).Return(msigAlias, nil)
expectVerifyMultisigPermission(t, s, []ids.ShortID{
msigAliasOwners.Addrs[0],
Expand Down Expand Up @@ -5460,7 +5460,7 @@ func TestCaminoStandardTxExecutorMultisigAliasTx(t *testing.T) {
"OK, add new alias": {
state: func(t *testing.T, c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
s := state.NewMockDiff(c)
expectGetMultisigAliases(s, msigAliasOwners.Addrs, nil)
expectGetMultisigAliases(t, s, msigAliasOwners.Addrs, nil)
s.EXPECT().GetBaseFee().Return(defaultTxFee, nil)
expectVerifyLock(t, s, utx.Ins, []*avax.UTXO{ownerUTXO}, []ids.ShortID{ownerAddr}, nil)
s.EXPECT().SetMultisigAlias(&multisig.AliasWithNonce{
Expand Down Expand Up @@ -5497,7 +5497,7 @@ func TestCaminoStandardTxExecutorMultisigAliasTx(t *testing.T) {
"OK, add new alias with multisig sender": {
state: func(t *testing.T, c *gomock.Controller, utx *txs.MultisigAliasTx, txID ids.ID) *state.MockDiff {
s := state.NewMockDiff(c)
expectGetMultisigAliases(s, msigAliasOwners.Addrs, nil)
expectGetMultisigAliases(t, s, msigAliasOwners.Addrs, nil)
s.EXPECT().GetBaseFee().Return(defaultTxFee, nil)
expectVerifyLock(t, s, utx.Ins, []*avax.UTXO{msigUTXO}, []ids.ShortID{
msigAlias.ID,
Expand Down

0 comments on commit b80ea2e

Please sign in to comment.