Merge pull request #406 from comdex-official/vault-refactor-d

update vault genesis state code
comdex-official · Aug 22, 2022 · 80ab0c8 · 80ab0c8
2 parents be06dad + 3649da6
commit 80ab0c8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/x/vault/genesis.go b/x/vault/genesis.go
@@ -17,23 +17,23 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, state *types.GenesisState) {
 		k.SetStableMintVault(ctx, item)
 	}
 
-	// for _, item := range state.AppExtendedPairVaultMapping {
-	// 	err := k.SetAppExtendedPairVaultMappingData(ctx, item)
-	// 	if err != nil {
-	// 		return
-	// 	}
-	// }
-
-	// for _, item := range state.UserVaultAssetMapping {
-	// 	k.SetUserVaultExtendedPairMapping(ctx, item)
-	// }
+	for _, item := range state.AppExtendedPairVaultMapping {
+		err := k.SetAppExtendedPairVaultMappingData(ctx, item)
+		if err != nil {
+			return
+		}
+	}
+
+	for _, item := range state.UserVaultAssetMapping {
+		k.SetUserAppExtendedPairMappingData(ctx, item)
+	}
 }
 
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	return types.NewGenesisState(
 		k.GetVaults(ctx),
 		k.GetStableMintVaults(ctx),
-		// k.GetAllAppExtendedPairVaultMapping(ctx),
-		// k.GetAllUserVaultExtendedPairMapping(ctx),
+		k.GetAllAppExtendedPairVaultMapping(ctx),
+		k.GetAllUserVaultExtendedPairMapping(ctx),
 	)
 }
diff --git a/x/vault/types/genesis.go b/x/vault/types/genesis.go
@@ -1,20 +1,20 @@
 package types
 
-func NewGenesisState(vaults []Vault, stableMintVault []StableMintVault) *GenesisState {
+func NewGenesisState(vaults []Vault, stableMintVault []StableMintVault, appExtendedPairVaultMapping []AppExtendedPairVaultMappingData, userVaultAssetMapping []OwnerAppExtendedPairVaultMappingData) *GenesisState {
 	return &GenesisState{
-		Vaults:          vaults,
-		StableMintVault: stableMintVault,
-		// AppExtendedPairVaultMapping: appExtendedPairVaultMapping,
-		// UserVaultAssetMapping:       userVaultAssetMapping,
+		Vaults:                      vaults,
+		StableMintVault:             stableMintVault,
+		AppExtendedPairVaultMapping: appExtendedPairVaultMapping,
+		UserVaultAssetMapping:       userVaultAssetMapping,
 	}
 }
 
 func DefaultGenesisState() *GenesisState {
 	return NewGenesisState(
 		[]Vault{},
 		[]StableMintVault{},
-		// []AppExtendedPairVaultMappingData{},
-		// []UserVaultAssetMapping{},
+		[]AppExtendedPairVaultMappingData{},
+		[]OwnerAppExtendedPairVaultMappingData{},
 	)
 }