fix: Add sims export/import test and fix (backport #23462) (#23464)

Co-authored-by: Alexander Peters <[email protected]> Co-authored-by: Julien Robert <[email protected]>
cosmos · Jan 20, 2025 · 2fddc86 · 2fddc86
1 parent 4c47d8d
commit 2fddc86
Show file tree

Hide file tree

Showing 17 changed files with 597 additions and 343 deletions.
diff --git a/simapp/app_config.go b/simapp/app_config.go
@@ -182,6 +182,9 @@ var (
 					SkipStoreKeys: []string{
 						authtxconfig.DepinjectModuleName,
 						validate.ModuleName,
+						genutiltypes.ModuleName,
+						runtime.ModuleName,
+						vestingtypes.ModuleName,
 					},
 				}),
 			},

diff --git a/types/simulation/collections.go b/types/simulation/collections.go
@@ -37,13 +37,16 @@ func NewStoreDecoderFuncFromCollectionsSchema(schema collections.Schema) func(kv
 				if err != nil {
 					panic(err)
 				}
-				vAString, err := vc.Stringify(vA)
-				if err != nil {
-					panic(err)
+				vAString, vBString := "<nil>", "<nil>"
+				if vA != nil {
+					if vAString, err = vc.Stringify(vA); err != nil {
+						panic(err)
+					}
 				}
-				vBString, err := vc.Stringify(vB)
-				if err != nil {
-					panic(err)
+				if vB != nil {
+					if vBString, err = vc.Stringify(vB); err != nil {
+						panic(err)
+					}
 				}
 				return vAString + "\n" + vBString
 			}

diff --git a/x/accounts/defaults/lockup/v1/lockup.pb.go b/x/accounts/defaults/lockup/v1/lockup.pb.go
diff --git a/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto
@@ -23,6 +23,7 @@ message Period {
   ];
 }
 
+// UnbondingEntries list of elements
 message UnbondingEntries {
   repeated UnbondingEntry entries = 1;
 }

diff --git a/x/accounts/proto/cosmos/accounts/v1/tx.proto b/x/accounts/proto/cosmos/accounts/v1/tx.proto
@@ -7,7 +7,6 @@ option go_package = "cosmossdk.io/x/accounts/v1";
 import "google/protobuf/any.proto";
 import "cosmos/msg/v1/msg.proto";
 import "cosmos/base/v1beta1/coin.proto";
-import "cosmos/tx/v1beta1/tx.proto";
 import "gogoproto/gogo.proto";
 
 // Msg defines the Msg service for the x/accounts module.

diff --git a/x/accounts/v1/tx.pb.go b/x/accounts/v1/tx.pb.go
diff --git a/x/mint/proto/cosmos/mint/v1beta1/mint.proto b/x/mint/proto/cosmos/mint/v1beta1/mint.proto
@@ -6,7 +6,6 @@ option go_package = "cosmossdk.io/x/mint/types";
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "amino/amino.proto";
-import "google/protobuf/any.proto";
 
 // Minter represents the minting state.
 message Minter {

diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go
diff --git a/x/protocolpool/proto/cosmos/protocolpool/v1/genesis.proto b/x/protocolpool/proto/cosmos/protocolpool/v1/genesis.proto
@@ -5,7 +5,6 @@ option go_package = "cosmossdk.io/x/protocolpool/types";
 
 import "cosmos/protocolpool/v1/types.proto";
 import "gogoproto/gogo.proto";
-import "cosmos_proto/cosmos.proto";
 import "google/protobuf/timestamp.proto";
 
 // GenesisState defines the protocolpool module's genesis state.
@@ -29,6 +28,7 @@ message GenesisState {
   Params params = 5;
 }
 
+// Distribution time with amount tuple
 message Distribution {
   // time at which this distribution was made, in order to distribute to non-expired funds only
   // and funds that existed at that time. Because we don't distribute right away, we keep track
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ message Period { @@
       ];
     }
+    // UnbondingEntries list of elements
     message UnbondingEntries {
       repeated UnbondingEntry entries = 1;
     }
@@ Expand Down @@