Skip to content

Commit

Permalink
chore: lint (#467)
Browse files Browse the repository at this point in the history
  • Loading branch information
testinginprod authored May 23, 2022
1 parent e5e950e commit 8d3640d
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 3 deletions.
2 changes: 1 addition & 1 deletion x/incentivization/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (k Keeper) CreateIncentivizationProgram(
return nil, types.ErrMinLockupDurationTooLow.Wrapf("%s is lower than minimum allowed %s", minLockupDuration, MinLockupDuration)
}

if ctx.BlockTime().Before(starTime) {
if ctx.BlockTime().After(starTime) {
return nil, types.ErrStartTimeInPast.Wrapf("current time %s, got: %s", ctx.BlockTime(), starTime)
}

Expand Down
14 changes: 14 additions & 0 deletions x/incentivization/keeper/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,17 @@ func (s IncentivizationProgramState) denomKey(denom string, pk []byte) []byte {
key = append(key, pk...)
return key
}

// IteratePrograms iterates over every program
func (s IncentivizationProgramState) IteratePrograms(do func(program *types.IncentivizationProgram) (stop bool)) {
iter := s.incentivizationPrograms.Iterator(nil, nil)
defer iter.Close()

for ; iter.Valid(); iter.Next() {
program := new(types.IncentivizationProgram)
s.cdc.MustUnmarshal(iter.Value(), program)
if do(program) {
break
}
}
}
10 changes: 8 additions & 2 deletions x/incentivization/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,14 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.Ra

// ExportGenesis returns the capability module's exported genesis state as raw JSON bytes.
func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
// genState := ExportGenesis(ctx, am.keeper)
return cdc.MustMarshalJSON(types.DefaultGenesis())
state := new(types.GenesisState)

am.keeper.IncentivizationProgramsState(ctx).IteratePrograms(func(program *types.IncentivizationProgram) (stop bool) {
state.IncentivizationPrograms = append(state.IncentivizationPrograms, program)
return false
})

return am.cdc.MustMarshalJSON(state)
}

// BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
Expand Down
46 changes: 46 additions & 0 deletions x/incentivization/module_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package incentivization_test

import (
"testing"
"time"

"github.com/stretchr/testify/require"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/NibiruChain/nibiru/x/incentivization"
"github.com/NibiruChain/nibiru/x/incentivization/keeper"
"github.com/NibiruChain/nibiru/x/incentivization/types"
"github.com/NibiruChain/nibiru/x/testutil"
)

func TestAppModule_InitGenesis_ExportGenesis(t *testing.T) {
app := testutil.NewTestApp(false)

am := incentivization.NewAppModule(app.AppCodec(), app.IncentivizationKeeper)
ctxUncached := app.NewContext(false, tmproto.Header{Time: time.Now()})
ctx, _ := ctxUncached.CacheContext()
// create some programs
var programs []*types.IncentivizationProgram
for i := 0; i < 100; i++ {
program, err := app.IncentivizationKeeper.CreateIncentivizationProgram(ctx, "denom",
24*time.Hour+time.Second*time.Duration(i), time.Now().Add(time.Duration(i)*time.Second),
int64(i)*100+keeper.MinEpochs)
require.NoError(t, err)
program.StartTime = program.StartTime.UTC()
programs = append(programs, program)
}

// export genesis
genesisRaw := am.ExportGenesis(ctx, app.AppCodec())
genesis := new(types.GenesisState)
app.AppCodec().MustUnmarshalJSON(genesisRaw, genesis)
require.Equal(t, programs, genesis.IncentivizationPrograms) // must be equal to creation
// init genesis
ctx, _ = ctxUncached.CacheContext()
am.InitGenesis(ctx, app.AppCodec(), genesisRaw)
// export again
genesisRaw = am.ExportGenesis(ctx, app.AppCodec())
genesis = new(types.GenesisState)
app.AppCodec().MustUnmarshalJSON(genesisRaw, genesis)
require.Equal(t, programs, genesis.IncentivizationPrograms) // must be equal to export
}

0 comments on commit 8d3640d

Please sign in to comment.