fix: linter & staticcheck errors

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2024-08-29 11:15:37 +02:00
parent cc7af11974
commit 237a66cc73
No known key found for this signature in database
GPG Key ID: FA5EE906EB55316A
8 changed files with 14 additions and 14 deletions

View File

@ -51,21 +51,21 @@ func (cm CheckMachineDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
func (cm CheckMachineDecorator) handleNotarizeAsset(ctx sdk.Context, notarizeMsg *assettypes.MsgNotarizeAsset) (sdk.Context, error) { func (cm CheckMachineDecorator) handleNotarizeAsset(ctx sdk.Context, notarizeMsg *assettypes.MsgNotarizeAsset) (sdk.Context, error) {
_, found := cm.mk.GetMachineIndexByAddress(ctx, notarizeMsg.GetCreator()) _, found := cm.mk.GetMachineIndexByAddress(ctx, notarizeMsg.GetCreator())
if !found { if !found {
return ctx, errorsmod.Wrapf(machinetypes.ErrMachineNotFound, ErrorAnteContext) return ctx, errorsmod.Wrap(machinetypes.ErrMachineNotFound, ErrorAnteContext)
} }
return ctx, nil return ctx, nil
} }
func (cm CheckMachineDecorator) handleAttestMachine(ctx sdk.Context, attestMsg *machinetypes.MsgAttestMachine) (sdk.Context, error) { func (cm CheckMachineDecorator) handleAttestMachine(ctx sdk.Context, attestMsg *machinetypes.MsgAttestMachine) (sdk.Context, error) {
if attestMsg.GetCreator() != attestMsg.Machine.GetAddress() { if attestMsg.GetCreator() != attestMsg.Machine.GetAddress() {
return ctx, errorsmod.Wrapf(machinetypes.ErrMachineIsNotCreator, ErrorAnteContext) return ctx, errorsmod.Wrap(machinetypes.ErrMachineIsNotCreator, ErrorAnteContext)
} }
_, activated, found := cm.mk.GetTrustAnchor(ctx, attestMsg.Machine.MachineId) _, activated, found := cm.mk.GetTrustAnchor(ctx, attestMsg.Machine.MachineId)
if !found { if !found {
return ctx, errorsmod.Wrapf(machinetypes.ErrTrustAnchorNotFound, ErrorAnteContext) return ctx, errorsmod.Wrap(machinetypes.ErrTrustAnchorNotFound, ErrorAnteContext)
} }
if activated { if activated {
return ctx, errorsmod.Wrapf(machinetypes.ErrTrustAnchorAlreadyInUse, ErrorAnteContext) return ctx, errorsmod.Wrap(machinetypes.ErrTrustAnchorAlreadyInUse, ErrorAnteContext)
} }
return ctx, nil return ctx, nil
} }
@ -73,7 +73,7 @@ func (cm CheckMachineDecorator) handleAttestMachine(ctx sdk.Context, attestMsg *
func (cm CheckMachineDecorator) handlePopResult(ctx sdk.Context, popMsg *daotypes.MsgReportPopResult) (sdk.Context, error) { func (cm CheckMachineDecorator) handlePopResult(ctx sdk.Context, popMsg *daotypes.MsgReportPopResult) (sdk.Context, error) {
_, found := cm.mk.GetMachineIndexByAddress(ctx, popMsg.GetCreator()) _, found := cm.mk.GetMachineIndexByAddress(ctx, popMsg.GetCreator())
if !found { if !found {
return ctx, errorsmod.Wrapf(machinetypes.ErrMachineNotFound, ErrorAnteContext) return ctx, errorsmod.Wrap(machinetypes.ErrMachineNotFound, ErrorAnteContext)
} }
return ctx, nil return ctx, nil
} }

View File

@ -53,7 +53,7 @@ func (cv CheckValidatorDecorator) handleMsg(ctx sdk.Context, msg sdk.Msg) (_ sdk
signer := msg.GetSigners()[0] signer := msg.GetSigners()[0]
_, found := cv.sk.GetValidator(ctx, sdk.ValAddress(signer)) _, found := cv.sk.GetValidator(ctx, sdk.ValAddress(signer))
if !found { if !found {
return ctx, errorsmod.Wrapf(types.ErrRestrictedMsg, ErrorAnteContext) return ctx, errorsmod.Wrap(types.ErrRestrictedMsg, ErrorAnteContext)
} }
return ctx, nil return ctx, nil
} }

View File

@ -166,7 +166,7 @@ func (dfd DeductFeeDecorator) deductFees(bankKeeper authtypes.BankKeeper, ctx sd
err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), authtypes.FeeCollectorName, fees) err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), authtypes.FeeCollectorName, fees)
if err != nil { if err != nil {
return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) return errorsmod.Wrap(sdkerrors.ErrInsufficientFunds, err.Error())
} }
return nil return nil

View File

@ -39,7 +39,7 @@ func (sud SetUpContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
// Set a gas meter with limit 0 as to prevent an infinite gas meter attack // Set a gas meter with limit 0 as to prevent an infinite gas meter attack
// during runTx. // during runTx.
newCtx = SetGasMeter(simulate, ctx, 0) newCtx = SetGasMeter(simulate, ctx, 0)
return newCtx, errorsmod.Wrapf(sdkerrors.ErrTxDecode, "Tx must be GasTx") return newCtx, errorsmod.Wrap(sdkerrors.ErrTxDecode, "Tx must be GasTx")
} }
gasLimit := sud.dk.GetTxGasLimit(ctx) gasLimit := sud.dk.GetTxGasLimit(ctx)
@ -70,7 +70,7 @@ func (sud SetUpContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
"out of gas in location: %v; gasWanted: %d, gasUsed: %d", "out of gas in location: %v; gasWanted: %d, gasUsed: %d",
rType.Descriptor, gasTx.GetGas(), newCtx.GasMeter().GasConsumed()) rType.Descriptor, gasTx.GetGas(), newCtx.GasMeter().GasConsumed())
err = errorsmod.Wrapf(sdkerrors.ErrOutOfGas, log) err = errorsmod.Wrap(sdkerrors.ErrOutOfGas, log)
default: default:
panic(r) panic(r)
} }

View File

@ -256,7 +256,7 @@ func IsLegitMachineAddress(address string) (active bool, err error) {
// Check the status code // Check the status code
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
log.Printf("[app] [Monitor] Error: unexpected status code: " + string(body)) log.Print("[app] [Monitor] Error: unexpected status code: " + string(body))
return return
} }

View File

@ -54,7 +54,7 @@ func (logger *AppLogger) testingLog(msg string, keyvals ...interface{}) {
return return
} }
msg = format(msg, keyvals...) msg = format(msg, keyvals...)
logger.testingLogger.Logf(msg) logger.testingLogger.Log(msg)
} }
func (logger *AppLogger) Info(ctx sdk.Context, msg string, keyvals ...interface{}) { func (logger *AppLogger) Info(ctx sdk.Context, msg string, keyvals ...interface{}) {

View File

@ -58,7 +58,7 @@ func (k msgServer) validateReissuanceProposal(ctx sdk.Context, msg *types.MsgRei
isValid := k.IsValidReissuanceProposal(ctx, msg) isValid := k.IsValidReissuanceProposal(ctx, msg)
if !isValid { if !isValid {
util.GetAppLogger().Info(ctx, reissueTag+"rejected reissuance proposal") util.GetAppLogger().Info(ctx, reissueTag+"rejected reissuance proposal")
return errorsmod.Wrapf(types.ErrReissuanceProposal, reissueTag) return errorsmod.Wrap(types.ErrReissuanceProposal, reissueTag)
} }
util.GetAppLogger().Debug(ctx, reissueTag+"accepted reissuance proposal: "+msg.String()) util.GetAppLogger().Debug(ctx, reissueTag+"accepted reissuance proposal: "+msg.String())
return return

View File

@ -35,7 +35,7 @@ func (k msgServer) ReportPopResult(goCtx context.Context, msg *types.MsgReportPo
err := util.ValidateStruct(*msg.Challenge) err := util.ValidateStruct(*msg.Challenge)
if err != nil { if err != nil {
return nil, errorsmod.Wrapf(types.ErrInvalidChallenge, err.Error()) return nil, errorsmod.Wrap(types.ErrInvalidChallenge, err.Error())
} }
// verify that the report origin is the challenger // verify that the report origin is the challenger
@ -64,7 +64,7 @@ func (k msgServer) ReportPopResult(goCtx context.Context, msg *types.MsgReportPo
err = k.issuePoPRewards(ctx, *msg.Challenge) err = k.issuePoPRewards(ctx, *msg.Challenge)
if err != nil { if err != nil {
return nil, errorsmod.Wrapf(types.ErrFailedPoPRewardsIssuance, err.Error()) return nil, errorsmod.Wrap(types.ErrFailedPoPRewardsIssuance, err.Error())
} }
return &types.MsgReportPopResultResponse{}, nil return &types.MsgReportPopResultResponse{}, nil