Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up Msgs and Codecs. #1957

Merged
merged 43 commits into from
May 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f80182b
[1760]: Rename all the msg.go files (and their relatives) to msgs.go.
SpicyLemon Apr 25, 2024
2acde49
[1760]: Standardize all the msg and codec definition to use a public …
SpicyLemon Apr 25, 2024
c97e0ba
[1760]: Create RunGetSignersTests to standardize checking signers-rel…
SpicyLemon Apr 25, 2024
3915c4f
[1760]: Switch the exchange GetSigners test over to the new RunGetSig…
SpicyLemon Apr 25, 2024
6084f42
[1760]: Switch the metadata GetSigners test over to the new RunGetSig…
SpicyLemon Apr 25, 2024
55c63e8
[1760]: For the legacy test runner, just make sure the panic contains…
SpicyLemon Apr 25, 2024
ca22068
[1760]: Add GetSigners tests to the attribute module.
SpicyLemon Apr 25, 2024
754144b
[1760]: Streamline the exchange GetSigners maker definitions.
SpicyLemon Apr 25, 2024
1ad68dc
[1760]: Change ExpPanic fields to ExpInErr since the new stuff isn't …
SpicyLemon Apr 25, 2024
cd2c8eb
[1760]: Add a GetSigners tests to the ibchooks module, and fix the Ms…
SpicyLemon Apr 25, 2024
aeb142b
[1760]: Add GetSigners tests to the ibcratelimit module.
SpicyLemon Apr 25, 2024
de5cc29
[1760]: GetSigners Tests on all the marker Msgs, and fix MsgCancelReq…
SpicyLemon Apr 25, 2024
c45b90d
[1760]: Switch to RunGetSignersTests in the msgfees module.
SpicyLemon Apr 25, 2024
11e303e
[1760]: Switch to RunGetSignersTests in the name module.
SpicyLemon Apr 26, 2024
5c7bd21
[1760]: Switch to RunGetSignersTests in the oracle module.
SpicyLemon Apr 26, 2024
6f2829d
[1760]: Switch to RunGetSignersTests for the quarantine module.
SpicyLemon Apr 26, 2024
9586b7b
[1760]: Switch to RunGetSignersTests for the sanction module.
SpicyLemon Apr 26, 2024
297cb5d
[1760]: Switch to RunGetSignersTests for the trigger module.
SpicyLemon Apr 26, 2024
fc26552
[1760]: Get rid of most of the GetSigners methods (the ones that were…
SpicyLemon Apr 26, 2024
ff4bac0
[1760]: Remove the marker module's GetSigners methods, and update the…
SpicyLemon Apr 26, 2024
91bf74a
[1760]: Remove the GetSigners() methods from the metadata module.
SpicyLemon Apr 26, 2024
8bfd5d1
[1760]: Get rid of some ibchooks msg methods that used to be required…
SpicyLemon Apr 26, 2024
f68ee9b
[1760]: Reorder the stuff in marker/types/msgs.go to match the order …
SpicyLemon Apr 26, 2024
32e5701
[1760]: Reorder the stuff in names msgs.go to match the proto ordering.
SpicyLemon Apr 26, 2024
eda386a
[1760]: Reorganize the metadata msgs.go stuff.
SpicyLemon Apr 26, 2024
1631742
[1760]: Clean up the attribute and ibchooks protos a little.
SpicyLemon Apr 26, 2024
f9c9574
[1760]: Get rid of most of the yaml tags from the protos. Only ones l…
SpicyLemon Apr 26, 2024
0591d78
Merge branch 'main' into dwedul/1760-get-signers
SpicyLemon May 6, 2024
04b6482
[1760]: Remove the rest of the uses of gogoproto.moretags.
SpicyLemon May 6, 2024
8df46bd
[1760]: Clean up some unneeded gogoproto.goproto_stringer options fro…
SpicyLemon May 6, 2024
98bf7a0
[1760]: Update all the Coins fields in the protos to match the same o…
SpicyLemon May 6, 2024
3c6c635
[1760]: Remove all uses of any ModuleCdc variables, and delete them all.
SpicyLemon May 6, 2024
4da9f03
[1760]: In GetFeePayerUsingFeeGrant, cast the feePayer and feeGranter…
SpicyLemon May 6, 2024
7d40bf5
[1760]: Get rid of all the String() methods that just do yaml convers…
SpicyLemon May 7, 2024
06aaf93
[1760]: Refactor the MetadataAddress.Format method to handle more cas…
SpicyLemon May 7, 2024
10694a8
Merge branch 'main' into dwedul/1760-get-signers
SpicyLemon May 7, 2024
f56953a
[1760]: Remove a private unused function: stringsToAccAddresses
SpicyLemon May 7, 2024
7c14061
[1760]: Switch to sigs.k8s.io/yaml (from gopkg.in/yaml.v2) in the las…
SpicyLemon May 7, 2024
7208658
[1760]: Move DefineCustomGetSigners to the top of the file.
SpicyLemon May 7, 2024
c582371
[1760]: Add changelog entries.
SpicyLemon May 7, 2024
378c796
[1760]: Move now-indirect require of gopkg.in/yaml.v2 to the indirect…
SpicyLemon May 8, 2024
cd11009
[1760]: Tweak the MetadataAddress.Format method: add some comments an…
SpicyLemon May 8, 2024
004bc00
Merge branch 'main' into dwedul/1760-get-signers
SpicyLemon May 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[1760]: Clean up some unneeded gogoproto.goproto_stringer options fro…
…m the protos.
  • Loading branch information
SpicyLemon committed May 6, 2024
commit 8df46bdb06e7f7ddee9bf63c899de79a09130035
147 changes: 63 additions & 84 deletions proto/provenance/metadata/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -90,10 +90,9 @@ service Msg {

// MsgWriteScopeRequest is the request type for the Msg/WriteScope RPC method.
message MsgWriteScopeRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// scope is the Scope you want added or updated.
Scope scope = 1 [(gogoproto.nullable) = false];
@@ -125,10 +124,9 @@ message MsgWriteScopeResponse {

// MsgDeleteScopeRequest is the request type for the Msg/DeleteScope RPC method.
message MsgDeleteScopeRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// Unique ID for the scope to delete
bytes scope_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -140,10 +138,9 @@ message MsgDeleteScopeResponse {}

// MsgAddScopeDataAccessRequest is the request to add data access AccAddress to scope
message MsgAddScopeDataAccessRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// scope MetadataAddress for updating data access
bytes scope_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -159,10 +156,9 @@ message MsgAddScopeDataAccessResponse {}

// MsgDeleteScopeDataAccessRequest is the request to remove data access AccAddress to scope
message MsgDeleteScopeDataAccessRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// scope MetadataAddress for removing data access
bytes scope_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -178,10 +174,9 @@ message MsgDeleteScopeDataAccessResponse {}

// MsgAddScopeOwnerRequest is the request to add owner AccAddress to scope
message MsgAddScopeOwnerRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// scope MetadataAddress for updating data access
bytes scope_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -197,10 +192,9 @@ message MsgAddScopeOwnerResponse {}

// MsgDeleteScopeOwnerRequest is the request to remove owner AccAddresses to scope
message MsgDeleteScopeOwnerRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// scope MetadataAddress for removing data access
bytes scope_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -216,10 +210,9 @@ message MsgDeleteScopeOwnerResponse {}

// MsgUpdateValueOwnersRequest is the request to update the value owner addresses in one or more scopes.
message MsgUpdateValueOwnersRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// scope_ids are the scope metadata addresses of all scopes to be updated.
repeated bytes scope_ids = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -234,10 +227,9 @@ message MsgUpdateValueOwnersResponse {}

// MsgMigrateValueOwnerRequest is the request to migrate all scopes with one value owner to another value owner.
message MsgMigrateValueOwnerRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// existing is the value owner address that is being migrated.
string existing = 1;
@@ -252,10 +244,9 @@ message MsgMigrateValueOwnerResponse {}

// MsgWriteSessionRequest is the request type for the Msg/WriteSession RPC method.
message MsgWriteSessionRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// session is the Session you want added or updated.
Session session = 1 [(gogoproto.nullable) = false];
@@ -299,10 +290,9 @@ message MsgWriteSessionResponse {

// MsgWriteRecordRequest is the request type for the Msg/WriteRecord RPC method.
message MsgWriteRecordRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// record is the Record you want added or updated.
Record record = 1 [(gogoproto.nullable) = false];
@@ -338,10 +328,9 @@ message MsgWriteRecordResponse {

// MsgDeleteRecordRequest is the request type for the Msg/DeleteRecord RPC method.
message MsgDeleteRecordRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

bytes record_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];

@@ -353,10 +342,9 @@ message MsgDeleteRecordResponse {}

// MsgWriteScopeSpecificationRequest is the request type for the Msg/WriteScopeSpecification RPC method.
message MsgWriteScopeSpecificationRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// specification is the ScopeSpecification you want added or updated.
ScopeSpecification specification = 1 [(gogoproto.nullable) = false];
@@ -380,10 +368,9 @@ message MsgWriteScopeSpecificationResponse {

// MsgDeleteScopeSpecificationRequest is the request type for the Msg/DeleteScopeSpecification RPC method.
message MsgDeleteScopeSpecificationRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// MetadataAddress for the scope specification to delete.
bytes specification_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -395,10 +382,9 @@ message MsgDeleteScopeSpecificationResponse {}

// MsgWriteContractSpecificationRequest is the request type for the Msg/WriteContractSpecification RPC method.
message MsgWriteContractSpecificationRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// specification is the ContractSpecification you want added or updated.
ContractSpecification specification = 1 [(gogoproto.nullable) = false];
@@ -423,10 +409,9 @@ message MsgWriteContractSpecificationResponse {

// MsgAddContractSpecToScopeSpecRequest is the request type for the Msg/AddContractSpecToScopeSpec RPC method.
message MsgAddContractSpecToScopeSpecRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// MetadataAddress for the contract specification to add.
bytes contract_specification_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -441,10 +426,9 @@ message MsgAddContractSpecToScopeSpecResponse {}

// MsgDeleteContractSpecFromScopeSpecRequest is the request type for the Msg/DeleteContractSpecFromScopeSpec RPC method.
message MsgDeleteContractSpecFromScopeSpecRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// MetadataAddress for the contract specification to add.
bytes contract_specification_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -460,10 +444,9 @@ message MsgDeleteContractSpecFromScopeSpecResponse {}

// MsgDeleteContractSpecificationRequest is the request type for the Msg/DeleteContractSpecification RPC method.
message MsgDeleteContractSpecificationRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// MetadataAddress for the contract specification to delete.
bytes specification_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -475,10 +458,9 @@ message MsgDeleteContractSpecificationResponse {}

// MsgWriteRecordSpecificationRequest is the request type for the Msg/WriteRecordSpecification RPC method.
message MsgWriteRecordSpecificationRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// specification is the RecordSpecification you want added or updated.
RecordSpecification specification = 1 [(gogoproto.nullable) = false];
@@ -503,10 +485,9 @@ message MsgWriteRecordSpecificationResponse {

// MsgDeleteRecordSpecificationRequest is the request type for the Msg/DeleteRecordSpecification RPC method.
message MsgDeleteRecordSpecificationRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// MetadataAddress for the record specification to delete.
bytes specification_id = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "MetadataAddress"];
@@ -561,10 +542,9 @@ message MsgModifyOSLocatorResponse {

// MsgSetAccountDataRequest is the request to set/update/delete a scope's account data.
message MsgSetAccountDataRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// The identifier to associate the data with.
// Currently, only scope ids are supported.
@@ -622,10 +602,9 @@ message MsgP8eMemorializeContractResponse {

// MsgAddNetAssetValuesRequest defines the Msg/AddNetAssetValues request type
message MsgAddNetAssetValuesRequest {
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.goproto_getters) = false;
option (cosmos.msg.v1.signer) = "signers";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

string scope_id = 1;
repeated string signers = 2;
3 changes: 1 addition & 2 deletions proto/provenance/msgfees/v1/msgfees.proto
Original file line number Diff line number Diff line change
@@ -10,8 +10,7 @@ option java_multiple_files = true;

// Params defines the set of params for the msgfees module.
message Params {
option (gogoproto.equal) = false;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.equal) = false;
// floor_gas_price is the constant used to calculate fees when gas fees shares denom with msg fee.
//
// Conversions:
15 changes: 5 additions & 10 deletions proto/provenance/msgfees/v1/proposals.proto
Original file line number Diff line number Diff line change
@@ -12,8 +12,7 @@ option java_multiple_files = true;

// AddMsgFeeProposal defines a governance proposal to add additional msg based fee
message AddMsgFeeProposal {
option (gogoproto.equal) = true;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.equal) = true;

// propsal title
string title = 1;
@@ -35,8 +34,7 @@ message AddMsgFeeProposal {

// UpdateMsgFeeProposal defines a governance proposal to update a current msg based fee
message UpdateMsgFeeProposal {
option (gogoproto.equal) = true;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.equal) = true;

// propsal title
string title = 1;
@@ -56,8 +54,7 @@ message UpdateMsgFeeProposal {

// RemoveMsgFeeProposal defines a governance proposal to delete a current msg based fee
message RemoveMsgFeeProposal {
option (gogoproto.equal) = true;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.equal) = true;

// propsal title
string title = 1;
@@ -69,8 +66,7 @@ message RemoveMsgFeeProposal {

// UpdateNhashPerUsdMilProposal defines a governance proposal to update the nhash per usd mil param
message UpdateNhashPerUsdMilProposal {
option (gogoproto.equal) = true;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.equal) = true;

string title = 1; // proposal title
string description = 2; // proposal description
@@ -80,8 +76,7 @@ message UpdateNhashPerUsdMilProposal {

// UpdateConversionFeeDenomProposal defines a governance proposal to update the msg fee conversion denom
message UpdateConversionFeeDenomProposal {
option (gogoproto.equal) = true;
option (gogoproto.goproto_stringer) = true;
option (gogoproto.equal) = true;

string title = 1; // proposal title
string description = 2; // proposal description
Loading