fix: fix cyclic dependency between virtual group and storage module

bnb-chain · Nov 7, 2023 · 06b6b2e · 06b6b2e
1 parent 1c8ce9f
commit 06b6b2e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/app.go b/app/app.go
@@ -472,9 +472,7 @@ func New(
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.PaymentKeeper,
-		app.StorageKeeper,
 	)
-	virtualgroupModule := virtualgroupmodule.NewAppModule(appCodec, app.VirtualgroupKeeper, app.SpKeeper)
 
 	app.PermissionmoduleKeeper = *permissionmodulekeeper.NewKeeper(
 		appCodec,
@@ -498,6 +496,9 @@ func New(
 	)
 	storageModule := storagemodule.NewAppModule(appCodec, app.StorageKeeper, app.AccountKeeper, app.BankKeeper, app.SpKeeper)
 
+	app.VirtualgroupKeeper.SetStorageKeeper(&app.StorageKeeper)
+	virtualgroupModule := virtualgroupmodule.NewAppModule(appCodec, app.VirtualgroupKeeper, app.SpKeeper)
+
 	app.ChallengeKeeper = *challengemodulekeeper.NewKeeper(
 		appCodec,
 		keys[challengemoduletypes.StoreKey],

diff --git a/x/virtualgroup/keeper/keeper.go b/x/virtualgroup/keeper/keeper.go
@@ -45,7 +45,6 @@ func NewKeeper(
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
 	paymentKeeper types.PaymentKeeper,
-	storageKeeper types.StorageKeeper,
 ) *Keeper {
 
 	k := Keeper{
@@ -57,7 +56,6 @@ func NewKeeper(
 		accountKeeper: accountKeeper,
 		bankKeeper:    bankKeeper,
 		paymentKeeper: paymentKeeper,
-		storageKeeper: storageKeeper,
 	}
 
 	k.gvgSequence = sequence.NewSequence[uint32](types.GVGSequencePrefix)
@@ -66,6 +64,10 @@ func NewKeeper(
 	return &k
 }
 
+func (k *Keeper) SetStorageKeeper(storageKeeper types.StorageKeeper) {
+	k.storageKeeper = storageKeeper
+}
+
 func (k Keeper) GetAuthority() string {
 	return k.authority
 }

diff --git a/x/virtualgroup/keeper/payment_test.go b/x/virtualgroup/keeper/payment_test.go
@@ -48,7 +48,6 @@ func (s *TestSuite) SetupTest() {
 	accountKeeper := types.NewMockAccountKeeper(ctrl)
 	spKeeper := types.NewMockSpKeeper(ctrl)
 	paymentKeeper := types.NewMockPaymentKeeper(ctrl)
-	storageKeeper := types.NewMockStorageKeeper(ctrl)
 
 	s.ctx = testCtx.Ctx
 	s.virtualgroupKeeper = keeper.NewKeeper(
@@ -60,7 +59,6 @@ func (s *TestSuite) SetupTest() {
 		accountKeeper,
 		bankKeeper,
 		paymentKeeper,
-		storageKeeper,
 	)
 
 	s.cdc = encCfg.Codec