test(oracle): refactor oracle tests to not require running full blockchain networks, keeping them fast, deterministic, and stable (#2425)

* test(oracle): refactor oracle tests to not require running full blockchain networks, keeping them fast, deterministic, and stable

* refactor: remove unnecessary msg server functions,

* chore: changelog

* fix(gen-changelog): improve script robustness

* rm temp file

* chore: changelog

* improvements for oracle

Author: Unique-Divine

.cursorignore

@@ -51,4 +51,4 @@ x/devgas/*
 x/epochs/*
 x/genmsg/*
 x/inflation/*
-x/oracle/*
+# x/oracle/*

CHANGELOG-UNRELEASED.md

@@ -1,4 +1,5 @@
 ## Changelog Chunk
+* changelog
 * evm: rewrite eth_estimateGas for panic safety and performance in [#2424](https://github.com/NibiruChain/nibiru/pull/2424) - ([37dba0a](https://github.com/NibiruChain/nibiru/commit/37dba0aeef545ee7a943556e1132f1aab6f6be68))  by @Unique-Divine
 * chore: remove evm-core-ts and move it to ts-sdk in [#2423](https://github.com/NibiruChain/nibiru/pull/2423) - ([e1401f6](https://github.com/NibiruChain/nibiru/commit/e1401f69237b07d4f35f59e7de54abed2efe925b))  by @cgilbe27
 * docs(bank): README fixes

justfile

@@ -60,11 +60,21 @@ gen-changelog:
 
   LAST_VER="v2.7.0"
   start_branch="$(git branch --show-current)"
-  git checkout main
-  git-cliff "$LAST_VER.." -o CHANGELOG-UNRELEASED.md
-  git checkout "$start_branch"
+
+  tmpdir="$(mktemp -d)"
+  cleanup() { rm -rf "$tmpdir"; }
+  trap cleanup EXIT
+
+  # Create a detached worktree at main so we don’t touch the current branch
+  git fetch -q origin main
+  git worktree add --detach --quiet "$tmpdir" origin/main
+
+  # Run git-cliff in the main worktree but write the file into the original repo
+  ( cd "$tmpdir" && git-cliff "$LAST_VER.." ) > CHANGELOG-UNRELEASED.md
+
   log_success "Created CHANGELOG-UNRELEASED.md with changes since $LAST_VER"
-  git add CHANGELOG-UNRELEASED.md
+  git add CHANGELOG-UNRELEASED.md \
+    && git ci -m "chore: changelog" || true
 
 # Generate the Nibiru Token Registry files
 gen-token-registry:

x/evm/precompile/oracle.go

@@ -118,7 +118,7 @@ func (p precompileOracle) queryExchangeRate(
 		return nil, err
 	}
 
-	priceAtBlock, err := p.oracleKeeper.ExchangeRates.Get(ctx, assetPair)
+	priceAtBlock, err := p.oracleKeeper.ExchangeRateMap.Get(ctx, assetPair)
 	if err != nil {
 		return nil, err
 	}
@@ -181,7 +181,7 @@ func (p precompileOracle) chainLinkLatestRoundData(
 		return nil, err
 	}
 
-	priceAtBlock, err := p.oracleKeeper.ExchangeRates.Get(ctx, assetPair)
+	priceAtBlock, err := p.oracleKeeper.ExchangeRateMap.Get(ctx, assetPair)
 	if err != nil {
 		return nil, err
 	}

x/oracle/abci.go

@@ -14,7 +14,7 @@ import (
 func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
 
-	params, err := k.Params.Get(ctx)
+	params, err := k.ModuleParams.Get(ctx)
 	if err != nil {
 		return
 	}

x/oracle/abci_test.go

@@ -21,22 +21,22 @@ func TestOracleTallyTiming(t *testing.T) {
 		}, i)
 	}
 
-	params, err := input.OracleKeeper.Params.Get(input.Ctx)
+	params, err := input.OracleKeeper.ModuleParams.Get(input.Ctx)
 	require.NoError(t, err)
 
 	params.VotePeriod = 10 // set vote period to 10 for now, for convenience
 	params.ExpirationBlocks = 100
-	input.OracleKeeper.Params.Set(input.Ctx, params)
+	input.OracleKeeper.ModuleParams.Set(input.Ctx, params)
 	require.Equal(t, 1, int(input.Ctx.BlockHeight()))
 
 	EndBlocker(input.Ctx, input.OracleKeeper)
-	_, err = input.OracleKeeper.ExchangeRates.Get(input.Ctx, asset.PAIR_BTC)
+	_, err = input.OracleKeeper.ExchangeRateMap.Get(input.Ctx, asset.PAIR_BTC)
 	require.Error(t, err)
 
 	input.Ctx = input.Ctx.WithBlockHeight(int64(params.VotePeriod - 1))
 
 	EndBlocker(input.Ctx, input.OracleKeeper)
-	_, err = input.OracleKeeper.ExchangeRates.Get(input.Ctx, asset.PAIR_BTC)
+	_, err = input.OracleKeeper.ExchangeRateMap.Get(input.Ctx, asset.PAIR_BTC)
 	require.NoError(t, err)
 }
 
@@ -55,21 +55,21 @@ func TestOraclePriceExpiration(t *testing.T) {
 		}, i)
 	}
 
-	params, err := input.OracleKeeper.Params.Get(input.Ctx)
+	params, err := input.OracleKeeper.ModuleParams.Get(input.Ctx)
 	require.NoError(t, err)
 
 	params.VotePeriod = 10
 	params.ExpirationBlocks = 10
-	input.OracleKeeper.Params.Set(input.Ctx, params)
+	input.OracleKeeper.ModuleParams.Set(input.Ctx, params)
 
 	// Wait for prices to set
 	input.Ctx = input.Ctx.WithBlockHeight(int64(params.VotePeriod - 1))
 	EndBlocker(input.Ctx, input.OracleKeeper)
 
 	// Check if both prices are set
-	_, err = input.OracleKeeper.ExchangeRates.Get(input.Ctx, pair1)
+	_, err = input.OracleKeeper.ExchangeRateMap.Get(input.Ctx, pair1)
 	require.NoError(t, err)
-	_, err = input.OracleKeeper.ExchangeRates.Get(input.Ctx, pair2)
+	_, err = input.OracleKeeper.ExchangeRateMap.Get(input.Ctx, pair2)
 	require.NoError(t, err)
 
 	// Set prices for pair 1
@@ -89,12 +89,12 @@ func TestOraclePriceExpiration(t *testing.T) {
 	input.Ctx = input.Ctx.WithBlockHeight(int64(params.ExpirationBlocks+params.VotePeriod) + 1)
 	EndBlocker(input.Ctx, input.OracleKeeper)
 
-	_, err = input.OracleKeeper.ExchangeRates.Get(input.Ctx, pair1)
+	_, err = input.OracleKeeper.ExchangeRateMap.Get(input.Ctx, pair1)
 	require.NoError(t, err)
-	_, err = input.OracleKeeper.ExchangeRates.Get(input.Ctx, pair2)
+	_, err = input.OracleKeeper.ExchangeRateMap.Get(input.Ctx, pair2)
 	require.NoError(t, err)
 
-	querier := keeper.NewQuerier(input.OracleKeeper)
+	querier := input.OracleKeeper
 	{
 		res, err := querier.ExchangeRate(input.Ctx, &types.QueryExchangeRateRequest{
 			Pair: pair1,

x/oracle/genesis.go

@@ -78,7 +78,7 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState
 	if len(data.Rewards) != 0 {
 		keeper.RewardsID.Set(ctx, data.Rewards[len(data.Rewards)-1].Id)
 	}
-	keeper.Params.Set(ctx, data.Params)
+	keeper.ModuleParams.Set(ctx, data.Params)
 
 	// check if the module account exists
 	moduleAcc := keeper.AccountKeeper.GetModuleAccount(ctx, types.ModuleName)
@@ -91,7 +91,7 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState
 // to a genesis file, which can be imported again
 // with InitGenesis
 func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) *types.GenesisState {
-	params, err := keeper.Params.Get(ctx)
+	params, err := keeper.ModuleParams.Get(ctx)
 	if err != nil {
 		panic(err)
 	}
@@ -105,7 +105,7 @@ func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) *types.GenesisState {
 	}
 
 	exchangeRates := []types.ExchangeRateTuple{}
-	for _, er := range keeper.ExchangeRates.Iterate(ctx, collections.Range[asset.Pair]{}).KeyValues() {
+	for _, er := range keeper.ExchangeRateMap.Iterate(ctx, collections.Range[asset.Pair]{}).KeyValues() {
 		exchangeRates = append(exchangeRates, types.ExchangeRateTuple{Pair: er.Key, ExchangeRate: er.Value.ExchangeRate})
 	}
 

x/oracle/genesis_test.go

@@ -15,9 +15,9 @@ import (
 func TestExportInitGenesis(t *testing.T) {
 	input := keeper.CreateTestFixture(t)
 
-	input.OracleKeeper.Params.Set(input.Ctx, types.DefaultParams())
+	input.OracleKeeper.ModuleParams.Set(input.Ctx, types.DefaultParams())
 	input.OracleKeeper.FeederDelegations.Insert(input.Ctx, keeper.ValAddrs[0], keeper.Addrs[1])
-	input.OracleKeeper.ExchangeRates.Insert(input.Ctx, "pair1:pair2",
+	input.OracleKeeper.ExchangeRateMap.Insert(input.Ctx, "pair1:pair2",
 		types.ExchangeRateAtBlock{
 			ExchangeRate:     sdkmath.LegacyNewDec(123),
 			CreatedBlock:     0,