Skip to content

Commit 2fddc86

Browse files
mergify[bot]alpejulienrbrt
authored
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]>
1 parent 4c47d8d commit 2fddc86

File tree

17 files changed

+597
-343
lines changed

17 files changed

+597
-343
lines changed

simapp/app_config.go

+3
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ var (
182182
SkipStoreKeys: []string{
183183
authtxconfig.DepinjectModuleName,
184184
validate.ModuleName,
185+
genutiltypes.ModuleName,
186+
runtime.ModuleName,
187+
vestingtypes.ModuleName,
185188
},
186189
}),
187190
},

types/simulation/collections.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@ func NewStoreDecoderFuncFromCollectionsSchema(schema collections.Schema) func(kv
3737
if err != nil {
3838
panic(err)
3939
}
40-
vAString, err := vc.Stringify(vA)
41-
if err != nil {
42-
panic(err)
40+
vAString, vBString := "<nil>", "<nil>"
41+
if vA != nil {
42+
if vAString, err = vc.Stringify(vA); err != nil {
43+
panic(err)
44+
}
4345
}
44-
vBString, err := vc.Stringify(vB)
45-
if err != nil {
46-
panic(err)
46+
if vB != nil {
47+
if vBString, err = vc.Stringify(vB); err != nil {
48+
panic(err)
49+
}
4750
}
4851
return vAString + "\n" + vBString
4952
}

x/accounts/defaults/lockup/v1/lockup.pb.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ message Period {
2323
];
2424
}
2525

26+
// UnbondingEntries list of elements
2627
message UnbondingEntries {
2728
repeated UnbondingEntry entries = 1;
2829
}

x/accounts/proto/cosmos/accounts/v1/tx.proto

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ option go_package = "cosmossdk.io/x/accounts/v1";
77
import "google/protobuf/any.proto";
88
import "cosmos/msg/v1/msg.proto";
99
import "cosmos/base/v1beta1/coin.proto";
10-
import "cosmos/tx/v1beta1/tx.proto";
1110
import "gogoproto/gogo.proto";
1211

1312
// Msg defines the Msg service for the x/accounts module.

x/accounts/v1/tx.pb.go

+45-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x/mint/proto/cosmos/mint/v1beta1/mint.proto

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ option go_package = "cosmossdk.io/x/mint/types";
66
import "gogoproto/gogo.proto";
77
import "cosmos_proto/cosmos.proto";
88
import "amino/amino.proto";
9-
import "google/protobuf/any.proto";
109

1110
// Minter represents the minting state.
1211
message Minter {

x/mint/types/mint.pb.go

+31-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x/protocolpool/proto/cosmos/protocolpool/v1/genesis.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ option go_package = "cosmossdk.io/x/protocolpool/types";
55

66
import "cosmos/protocolpool/v1/types.proto";
77
import "gogoproto/gogo.proto";
8-
import "cosmos_proto/cosmos.proto";
98
import "google/protobuf/timestamp.proto";
109

1110
// GenesisState defines the protocolpool module's genesis state.
@@ -29,6 +28,7 @@ message GenesisState {
2928
Params params = 5;
3029
}
3130

31+
// Distribution time with amount tuple
3232
message Distribution {
3333
// time at which this distribution was made, in order to distribute to non-expired funds only
3434
// and funds that existed at that time. Because we don't distribute right away, we keep track

0 commit comments

Comments
 (0)