rebase develop

zeta-chain · Dec 11, 2024 · a05339e · a05339e
1 parent 1167862
commit a05339e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/testutil/keeper/keeper.go b/testutil/keeper/keeper.go
@@ -525,6 +525,8 @@ func NewSDKKeepersWithKeys(
 		slashingKeeper,
 		authorityKeeper,
 		lightclientKeeper,
+		bankKeeper,
+		authKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	emissionsKeeper := emissionskeeper.NewKeeper(

diff --git a/x/observer/simulation/decoders_test.go b/x/observer/simulation/decoders_test.go
@@ -47,9 +47,9 @@ func TestNewDecodeStore(t *testing.T) {
 			{Key: types.KeyPrefix(types.BallotListKey), Value: cdc.MustMarshal(&ballotList)},
 			{Key: types.KeyPrefix(types.VoterKey), Value: cdc.MustMarshal(ballot)},
 			{Key: types.KeyPrefix(types.TSSKey), Value: cdc.MustMarshal(&tss)},
+			{Key: types.KeyPrefix(types.TSSHistoryKey), Value: cdc.MustMarshal(&tss)},
 			{Key: types.KeyPrefix(types.ObserverSetKey), Value: cdc.MustMarshal(&observerSet)},
 			{Key: types.KeyPrefix(types.AllChainParamsKey), Value: cdc.MustMarshal(&chainParamsList)},
-			{Key: types.KeyPrefix(types.TSSHistoryKey), Value: cdc.MustMarshal(&tss)},
 			{Key: types.KeyPrefix(types.TssFundMigratorKey), Value: cdc.MustMarshal(&tssFundMigrator)},
 			{Key: types.KeyPrefix(types.PendingNoncesKeyPrefix), Value: cdc.MustMarshal(&pendingNonce)},
 			{Key: types.KeyPrefix(types.ChainNoncesKey), Value: cdc.MustMarshal(&chainNonces)},