consistency in antehandler (cosmos#9144)

timlind · Apr 20, 2021 · b1cf479 · b1cf479
1 parent 83645e0
commit b1cf479
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/x/auth/ante/ante.go b/x/auth/ante/ante.go
@@ -43,7 +43,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		NewRejectExtensionOptionsDecorator(),
 		NewMempoolFeeDecorator(),
 		NewValidateBasicDecorator(),
-		TxTimeoutHeightDecorator{},
+		NewTxTimeoutHeightDecorator(),
 		NewValidateMemoDecorator(options.AccountKeeper),
 		NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),

diff --git a/x/auth/ante/basic.go b/x/auth/ante/basic.go
@@ -179,6 +179,12 @@ type (
 	}
 )
 
+// TxTimeoutHeightDecorator defines an AnteHandler decorator that checks for a
+// tx height timeout.
+func NewTxTimeoutHeightDecorator() TxTimeoutHeightDecorator {
+	return TxTimeoutHeightDecorator{}
+}
+
 // AnteHandle implements an AnteHandler decorator for the TxHeightTimeoutDecorator
 // type where the current block height is checked against the tx's height timeout.
 // If a height timeout is provided (non-zero) and is less than the current block

diff --git a/x/auth/ante/basic_test.go b/x/auth/ante/basic_test.go
@@ -177,7 +177,7 @@ func (suite *AnteTestSuite) TestConsumeGasForTxSize() {
 func (suite *AnteTestSuite) TestTxHeightTimeoutDecorator() {
 	suite.SetupTest(true)
 
-	antehandler := sdk.ChainAnteDecorators(ante.TxTimeoutHeightDecorator{})
+	antehandler := sdk.ChainAnteDecorators(ante.NewTxTimeoutHeightDecorator())
 
 	// keys and addresses
 	priv1, _, addr1 := testdata.KeyTestPubAddr()