From c32926aa91715abebdfa16b2a78c5c40e22a1d91 Mon Sep 17 00:00:00 2001 From: Nina Barbakadze Date: Fri, 7 Jun 2024 18:04:34 +0200 Subject: [PATCH] chore: revert unnecessary changes --- app/test/prepare_proposal_test.go | 4 +--- app/test/process_proposal_test.go | 1 - test/util/blobfactory/payforblob_factory.go | 3 +-- test/util/direct_tx_gen.go | 4 +--- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/test/prepare_proposal_test.go b/app/test/prepare_proposal_test.go index 2da3d79286..04b925e365 100644 --- a/app/test/prepare_proposal_test.go +++ b/app/test/prepare_proposal_test.go @@ -40,7 +40,6 @@ func TestPrepareProposalPutsPFBsAtEnd(t *testing.T) { testfactory.Repeat([]*blob.Blob{ blob.New(appns.RandomBlobNamespace(), []byte{1}, appconsts.DefaultShareVersion), }, numBlobTxs), - app.DefaultConsensusParams().Version.AppVersion, ) normalTxs := testutil.SendTxsWithAccounts( @@ -98,7 +97,6 @@ func TestPrepareProposalFiltering(t *testing.T) { testfactory.RandomBlobNamespaces(tmrand.NewRand(), 3), [][]int{{100}, {1000}, {420}}, ), - app.DefaultConsensusParams().Version.AppVersion, ) // create 3 MsgSend transactions that are signed with valid account numbers @@ -138,7 +136,7 @@ func TestPrepareProposalFiltering(t *testing.T) { nilAccount := "carmon san diego" _, _, err := kr.NewMnemonic(nilAccount, keyring.English, "", "", hd.Secp256k1) require.NoError(t, err) - noAccountTx := []byte(testutil.SendTxWithManualSequence(t, encConf.TxConfig, kr, nilAccount, accounts[0], 1000, "", 0, app.DefaultConsensusParams().Version.AppVersion, 6)) + noAccountTx := []byte(testutil.SendTxWithManualSequence(t, encConf.TxConfig, kr, nilAccount, accounts[0], 1000, "", 0, 6)) type test struct { name string diff --git a/app/test/process_proposal_test.go b/app/test/process_proposal_test.go index 9acaec6d99..fd52936322 100644 --- a/app/test/process_proposal_test.go +++ b/app/test/process_proposal_test.go @@ -47,7 +47,6 @@ func TestProcessProposal(t *testing.T) { testfactory.RandomBlobNamespaces(tmrand.NewRand(), 4), [][]int{{100}, {1000}, {420}, {300}}, ), - app.DefaultConsensusParams().Version.AppVersion, ) // create 3 MsgSend transactions that are signed with valid account numbers diff --git a/test/util/blobfactory/payforblob_factory.go b/test/util/blobfactory/payforblob_factory.go index 0db4cbca79..9860999940 100644 --- a/test/util/blobfactory/payforblob_factory.go +++ b/test/util/blobfactory/payforblob_factory.go @@ -222,13 +222,12 @@ func ManyMultiBlobTx( accounts []string, accInfos []AccountInfo, blobs [][]*blob.Blob, - appVersion uint64, ) [][]byte { t.Helper() txs := make([][]byte, len(accounts)) opts := DefaultTxOpts() for i, acc := range accounts { - signer, err := user.NewSigner(kr, enc, chainid, appVersion, user.NewAccount(acc, accInfos[i].AccountNum, accInfos[i].Sequence)) + signer, err := user.NewSigner(kr, enc, chainid, appconsts.LatestVersion, user.NewAccount(acc, accInfos[i].AccountNum, accInfos[i].Sequence)) require.NoError(t, err) txs[i], _, err = signer.CreatePayForBlobs(acc, blobs[i], opts...) require.NoError(t, err) diff --git a/test/util/direct_tx_gen.go b/test/util/direct_tx_gen.go index 902dc1baf5..ef0b47c24b 100644 --- a/test/util/direct_tx_gen.go +++ b/test/util/direct_tx_gen.go @@ -192,7 +192,6 @@ func SendTxsWithAccounts( chainid, acc.GetSequence(), acc.GetAccountNumber(), - appconsts.LatestVersion, opts..., ) } @@ -210,11 +209,10 @@ func SendTxWithManualSequence( amount uint64, chainid string, sequence, accountNum uint64, - appVersion uint64, opts ...user.TxOption, ) coretypes.Tx { fromAddr, toAddr := getAddress(fromAcc, kr), getAddress(toAcc, kr) - signer, err := user.NewSigner(kr, cfg, chainid, appVersion, user.NewAccount(fromAcc, accountNum, sequence)) + signer, err := user.NewSigner(kr, cfg, chainid, appconsts.LatestVersion, user.NewAccount(fromAcc, accountNum, sequence)) require.NoError(t, err) msg := banktypes.NewMsgSend(fromAddr, toAddr, sdk.NewCoins(sdk.NewCoin(app.BondDenom, sdk.NewIntFromUint64(amount))))