diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index 9ff63b204fd..15de3fb27ed 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -28,8 +28,8 @@ import ( var _ sdk.AnteDecorator = FeeDecorator{} type FeeDecorator struct { - GlobalMinFeeSubspace globalfee.ParamSource - StakingSubspace paramtypes.Subspace + GlobalMinFeeParamSource globalfee.ParamSource + StakingSubspace paramtypes.Subspace } func NewFeeDecorator(globalfeeSubspace, stakingSubspace paramtypes.Subspace) FeeDecorator { @@ -42,8 +42,8 @@ func NewFeeDecorator(globalfeeSubspace, stakingSubspace paramtypes.Subspace) Fee } return FeeDecorator{ - GlobalMinFeeSubspace: globalfeeSubspace, - StakingSubspace: stakingSubspace, + GlobalMinFeeParamSource: globalfeeSubspace, + StakingSubspace: stakingSubspace, } } @@ -186,8 +186,8 @@ func (mfd FeeDecorator) GetGlobalFee(ctx sdk.Context, feeTx sdk.FeeTx) (sdk.Coin err error ) - if mfd.GlobalMinFeeSubspace.Has(ctx, types.ParamStoreKeyMinGasPrices) { - mfd.GlobalMinFeeSubspace.Get(ctx, types.ParamStoreKeyMinGasPrices, &globalMinGasPrices) + if mfd.GlobalMinFeeParamSource.Has(ctx, types.ParamStoreKeyMinGasPrices) { + mfd.GlobalMinFeeParamSource.Get(ctx, types.ParamStoreKeyMinGasPrices, &globalMinGasPrices) } // global fee is empty set, set global fee to 0uatom if len(globalMinGasPrices) == 0 { @@ -239,16 +239,16 @@ func (mfd FeeDecorator) ContainsOnlyBypassMinFeeMsgs(ctx sdk.Context, msgs []sdk } func (mfd FeeDecorator) GetBypassMsgTypes(ctx sdk.Context) (res []string) { - if mfd.GlobalMinFeeSubspace.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { - mfd.GlobalMinFeeSubspace.Get(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &res) + if mfd.GlobalMinFeeParamSource.Has(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes) { + mfd.GlobalMinFeeParamSource.Get(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &res) } return } func (mfd FeeDecorator) GetMaxTotalBypassMinFeeMsgGasUsage(ctx sdk.Context) (res uint64) { - if mfd.GlobalMinFeeSubspace.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { - mfd.GlobalMinFeeSubspace.Get(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, &res) + if mfd.GlobalMinFeeParamSource.Has(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage) { + mfd.GlobalMinFeeParamSource.Get(ctx, types.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, &res) } return