fix broken tests

celestiaorg · Jun 22, 2023 · a51cfd3 · a51cfd3
1 parent 8277961
commit a51cfd3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/app/test/prepare_proposal_test.go b/app/test/prepare_proposal_test.go
@@ -50,7 +50,7 @@ func TestPrepareProposalPutsPFBsAtEnd(t *testing.T) {
 		1000,
 		accnts[0],
 		accnts[numBlobTxs:],
-		"",
+		testutil.ChainID,
 	)
 	txs := append(blobTxs, coretypes.Txs(normalTxs).ToSliceOfBytes()...)
 

diff --git a/app/test/process_proposal_test.go b/app/test/process_proposal_test.go
@@ -49,7 +49,7 @@ func TestProcessProposal(t *testing.T) {
 	// create 3 MsgSend transactions that are signed with valid account numbers
 	// and sequences
 	sendTxs := testutil.SendTxsWithAccounts(
-		t, testApp, enc, kr, 1000, accounts[0], accounts[len(accounts)-3:], "",
+		t, testApp, enc, kr, 1000, accounts[0], accounts[len(accounts)-3:], testutil.ChainID,
 	)
 
 	// block with all blobs included
@@ -65,11 +65,11 @@ func TestProcessProposal(t *testing.T) {
 	// create an invalid block by adding an otherwise valid PFB, but an invalid
 	// signature since there's no account
 	badSigBlobTx := testutil.RandBlobTxsWithManualSequence(
-		t, enc, kr, 1000, 1, false, "", accounts[:1], 1, 1, true,
+		t, enc, kr, 1000, 1, false, testutil.ChainID, accounts[:1], 1, 1, true,
 	)[0]
 
 	blobTxWithInvalidNonce := testutil.RandBlobTxsWithManualSequence(
-		t, enc, kr, 1000, 1, false, "", accounts[:1], 1, 3, false,
+		t, enc, kr, 1000, 1, false, testutil.ChainID, accounts[:1], 1, 3, false,
 	)[0]
 
 	ns1 := appns.MustNewV0(bytes.Repeat([]byte{1}, appns.NamespaceVersionZeroIDSize))

diff --git a/app/validate_txs.go b/app/validate_txs.go
@@ -3,8 +3,6 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	core "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	coretypes "github.com/tendermint/tendermint/types"
@@ -97,22 +95,3 @@ func encodeBlobTxs(blobTxs []tmproto.BlobTx) [][]byte {
 	}
 	return txs
 }
-
-// sigVerifyAnteHandler creates an AnteHandler with the SetupContext, SetPubKey,
-// SigVerification, and IncremementSequence ante decorators to check that
-// sequences have be incremented.
-func sigVerifyAnteHandler(accKeeper *authkeeper.AccountKeeper, txConfig client.TxConfig) sdk.AnteHandler {
-	setupd := ante.NewSetUpContextDecorator()
-	setPubKd := ante.NewSetPubKeyDecorator(accKeeper)
-	svd := ante.NewSigVerificationDecorator(accKeeper, txConfig.SignModeHandler())
-	isd := ante.NewIncrementSequenceDecorator(accKeeper)
-	return sdk.ChainAnteDecorators(setupd, setPubKd, svd, isd)
-}
-
-// incrementSequenceAnteHandler creates an AnteHandler that only incrememts the
-// sequence.
-func incrementSequenceAnteHandler(accKeeper *authkeeper.AccountKeeper) sdk.AnteHandler {
-	setupd := ante.NewSetUpContextDecorator()
-	isd := ante.NewIncrementSequenceDecorator(accKeeper)
-	return sdk.ChainAnteDecorators(setupd, isd)
-}