Skip to content

Commit

Permalink
chore: revert unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ninabarbakadze committed Jun 7, 2024
1 parent 7471b9a commit c32926a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
4 changes: 1 addition & 3 deletions app/test/prepare_proposal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/test/process_proposal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions test/util/blobfactory/payforblob_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions test/util/direct_tx_gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ func SendTxsWithAccounts(
chainid,
acc.GetSequence(),
acc.GetAccountNumber(),
appconsts.LatestVersion,
opts...,
)
}
Expand All @@ -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))))
Expand Down

0 comments on commit c32926a

Please sign in to comment.