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.

Sign up for GitHub

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

Jump to bottom

QoL: Cleaning Proto Files #378

Merged
merged 14 commits into from
Nov 14, 2023
Merged

QoL: Cleaning Proto Files #378

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1e65d67
updating some storage protos
TheMarstonConnell Nov 8, 2023
5e78401
query and txs are complete
TheMarstonConnell Nov 8, 2023
5a4dca1
fixing language used in protos
TheMarstonConnell Nov 8, 2023
b7e8529
storage module query refactor
TheMarstonConnell Nov 9, 2023
c2ce238
rns module query refactor
TheMarstonConnell Nov 9, 2023
29272b4
oracle module query refactor
TheMarstonConnell Nov 9, 2023
53b1c12
jklmint module query refactor
TheMarstonConnell Nov 9, 2023
218b4c6
filetree module query refactor
TheMarstonConnell Nov 9, 2023
1ace93b
erin recommendations
TheMarstonConnell Nov 9, 2023
c25f033
fix tests
TheMarstonConnell Nov 9, 2023
8c0850a
fumpt
TheMarstonConnell Nov 9, 2023
8f211f3
fixing some comments
TheMarstonConnell Nov 10, 2023
1fd0bb8
fixing make root name
TheMarstonConnell Nov 10, 2023
97430e9
erin suggestions again :p
TheMarstonConnell Nov 14, 2023
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
4 changes: 2 additions & 2 deletions proto/canine_chain/filetree/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types";
// GenesisState defines the filetree module's genesis state.
message GenesisState {
Params params = 1 [ (gogoproto.nullable) = false ];
repeated Files filesList = 2 [ (gogoproto.nullable) = false ];
repeated Pubkey pubkeyList = 3 [ (gogoproto.nullable) = false ];
repeated Files files_list = 2 [ (gogoproto.nullable) = false ];
repeated Pubkey pub_key_list = 3 [ (gogoproto.nullable) = false ];
}
44 changes: 22 additions & 22 deletions proto/canine_chain/filetree/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,50 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types";
// Query defines the gRPC querier service.
service Query {
// Parameters queries the parameters of the module.
rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
option (google.api.http).get = "/jackaldao/canine/filetree/params";
rpc Params(QueryParams) returns (QueryParamsResponse) {
option (google.api.http).get = "/jackal/canine/filetree/params";
}

// Queries a Files by index.
rpc Files(QueryFileRequest) returns (QueryFileResponse) {
rpc File(QueryFile) returns (QueryFileResponse) {
option (google.api.http).get =
"/jackal-dao/canine-chain/filetree/files/{address}/{ownerAddress}";
"/jackal/canine-chain/filetree/files/{address}/{owner_address}";
}

// Queries a list of Files items.
rpc FilesAll(QueryAllFilesRequest) returns (QueryAllFilesResponse) {
option (google.api.http).get = "/jackal-dao/canine-chain/filetree/files";
rpc AllFiles(QueryAllFiles) returns (QueryAllFilesResponse) {
option (google.api.http).get = "/jackal/canine-chain/filetree/files";
}

// Queries a Pubkey by index.
rpc Pubkey(QueryPubkeyRequest) returns (QueryPubkeyResponse) {
rpc PubKey(QueryPubKey) returns (QueryPubKeyResponse) {
option (google.api.http).get =
"/jackal-dao/canine-chain/filetree/pubkeys/{address}";
"/jackal/canine-chain/filetree/pubkeys/{address}";
}

// Queries a list of Pubkey items.
rpc PubkeyAll(QueryAllPubkeysRequest) returns (QueryAllPubkeysResponse) {
option (google.api.http).get = "/jackal-dao/canine-chain/filetree/pubkeys";
rpc AllPubKeys(QueryAllPubKeys) returns (QueryAllPubKeysResponse) {
option (google.api.http).get = "/jackal/canine-chain/filetree/pubkeys";
karnthis marked this conversation as resolved.
Show resolved Hide resolved
}
}

// QueryParamsRequest is request type for the Query/Params RPC method.
message QueryParamsRequest {}
// QueryParams is request type for the Query/Params RPC method.
message QueryParams {}

// QueryParamsResponse is response type for the Query/Params RPC method.
message QueryParamsResponse {
// params holds all the parameters of this module.
Params params = 1 [ (gogoproto.nullable) = false ];
}

message QueryFileRequest {
message QueryFile {
string address = 1;
string ownerAddress = 2;
string owner_address = 2;
}

message QueryFileResponse { Files files = 1 [ (gogoproto.nullable) = false ]; }
message QueryFileResponse { Files file = 1 [ (gogoproto.nullable) = false ]; }

message QueryAllFilesRequest {
message QueryAllFiles {
cosmos.base.query.v1beta1.PageRequest pagination = 1;
}

Expand All @@ -65,17 +65,17 @@ message QueryAllFilesResponse {
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}

message QueryPubkeyRequest { string address = 1; }
message QueryPubKey { string address = 1; }

message QueryPubkeyResponse {
Pubkey pubkey = 1 [ (gogoproto.nullable) = false ];
message QueryPubKeyResponse {
Pubkey pub_key = 1 [ (gogoproto.nullable) = false ];
}

message QueryAllPubkeysRequest {
message QueryAllPubKeys {
cosmos.base.query.v1beta1.PageRequest pagination = 1;
}

message QueryAllPubkeysResponse {
repeated Pubkey pubkey = 1 [ (gogoproto.nullable) = false ];
message QueryAllPubKeysResponse {
repeated Pubkey pub_key = 1 [ (gogoproto.nullable) = false ];
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}
46 changes: 23 additions & 23 deletions proto/canine_chain/filetree/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types";
service Msg {
rpc PostFile(MsgPostFile) returns (MsgPostFileResponse);
rpc AddViewers(MsgAddViewers) returns (MsgAddViewersResponse);
rpc Postkey(MsgPostkey) returns (MsgPostkeyResponse);
rpc PostKey(MsgPostKey) returns (MsgPostKeyResponse);
rpc DeleteFile(MsgDeleteFile) returns (MsgDeleteFileResponse);
rpc RemoveViewers(MsgRemoveViewers) returns (MsgRemoveViewersResponse);
rpc MakeRoot(MsgMakeRoot) returns (MsgMakeRootResponse);
Expand All @@ -23,58 +23,58 @@ service Msg {
message MsgPostFile {
string creator = 1;
string account = 2;
string hashParent = 3;
string hashChild = 4;
string hash_parent = 3;
string hash_child = 4;
string contents = 5;
string viewers = 6;
string editors = 7;
string trackingNumber = 8;
string tracking_number = 8;
}

message MsgPostFileResponse { string path = 1; }

message MsgAddViewers {
string creator = 1;
string viewerIds = 2;
string viewerKeys = 3;
string viewer_ids = 2;
string viewer_keys = 3;
string address = 4;
string fileowner = 5;
string file_owner = 5;
}

message MsgAddViewersResponse {}

message MsgPostkey {
message MsgPostKey {
string creator = 1;
string key = 2;
}

message MsgPostkeyResponse {}
message MsgPostKeyResponse {}

message MsgDeleteFile {
string creator = 1;
string hashPath = 2;
string hash_path = 2;
string account = 3;
}

message MsgDeleteFileResponse {}

message MsgRemoveViewers {
string creator = 1;
string viewerIds = 2;
string viewer_ids = 2;
string address = 3;
string fileowner = 4;
string file_owner = 4;
}

message MsgRemoveViewersResponse {}

message MsgMakeRoot {
karnthis marked this conversation as resolved.
Show resolved Hide resolved
string creator = 1;
string account = 2;
string rootHashPath = 3;
string root_hash_path = 3;
string contents = 4;
string editors = 5;
string viewers = 6;
string trackingNumber = 7;
string tracking_number = 7;
}

message MsgMakeRootResponse {}
Expand All @@ -83,48 +83,48 @@ message MsgMakeRootV2 {
string creator = 1;
string editors = 2;
string viewers = 3;
string trackingNumber = 4;
string tracking_number = 4;
}

message MsgAddEditors {
string creator = 1;
string editorIds = 2;
string editorKeys = 3;
string editor_ids = 2;
string editor_keys = 3;
string address = 4;
string fileowner = 5;
string file_owner = 5;
}

message MsgAddEditorsResponse {}

message MsgRemoveEditors {
string creator = 1;
string editorIds = 2;
string editor_ids = 2;
string address = 3;
string fileowner = 4;
string file_owner = 4;
}

message MsgRemoveEditorsResponse {}

message MsgResetEditors {
string creator = 1;
string address = 2;
string fileowner = 3;
string file_owner = 3;
}

message MsgResetEditorsResponse {}

message MsgResetViewers {
string creator = 1;
string address = 2;
string fileowner = 3;
string file_owner = 3;
}

message MsgResetViewersResponse {}

message MsgChangeOwner {
string creator = 1;
string address = 2;
string fileOwner = 3;
string file_owner = 3;
string newOwner = 4;
karnthis marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down
2 changes: 1 addition & 1 deletion proto/canine_chain/jklmint/params.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ message Params {
option (gogoproto.goproto_stringer) = false;

string mint_denom = 1 [ (gogoproto.moretags) = "yaml:\"mint_denom\"" ];
int64 providerRatio = 2 [ (gogoproto.moretags) = "yaml:\"provider_ratio\"" ];
int64 providerRatio = 2 [ (gogoproto.moretags) = "yaml:\"provider_ratio\"" ]; // TODO: fix casing
int64 tokensPerBlock = 3 [ (gogoproto.moretags) = "yaml:\"tokens_per_block\"" ];


Expand Down
8 changes: 4 additions & 4 deletions proto/canine_chain/jklmint/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ option go_package = "github.com/jackalLabs/canine-chain/x/jklmint/types";
// Query defines the gRPC querier service.
service Query {
// Parameters queries the parameters of the module.
rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
rpc Params(QueryParams) returns (QueryParamsResponse) {
option (google.api.http).get = "/cosmos/mint/v1beta1/params";
}

// Inflation returns the current minting inflation value.
rpc Inflation(QueryInflationRequest) returns (QueryInflationResponse) {
rpc Inflation(QueryInflation) returns (QueryInflationResponse) {
option (google.api.http).get = "/cosmos/mint/v1beta1/inflation";
}
}

// QueryParamsRequest is request type for the Query/Params RPC method.
message QueryParamsRequest {}
message QueryParams {}

// QueryParamsResponse is response type for the Query/Params RPC method.
message QueryParamsResponse {
Expand All @@ -30,7 +30,7 @@ message QueryParamsResponse {
}

// QueryInflationRequest is the request type for the Query/Inflation RPC method.
message QueryInflationRequest {}
message QueryInflation {}

// QueryInflationResponse is the response type for the Query/Inflation RPC
// method.
Expand Down
18 changes: 9 additions & 9 deletions proto/canine_chain/oracle/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@ option go_package = "github.com/jackalLabs/canine-chain/x/oracle/types";
// Query defines the gRPC querier service.
service Query {
// Parameters queries the parameters of the module.
rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
option (google.api.http).get = "/jackal-dao/canine-chain/oracle/params";
rpc Params(QueryParams) returns (QueryParamsResponse) {
option (google.api.http).get = "/jackal/canine-chain/oracle/params";
}

rpc Feed(QueryFeedRequest) returns (QueryFeedResponse) {
option (google.api.http).get = "/jackal-dao/canine-chain/oracle/feeds/{name}";
rpc Feed(QueryFeed) returns (QueryFeedResponse) {
option (google.api.http).get = "/jackal/canine-chain/oracle/feeds/{name}";
}

rpc AllFeeds(QueryAllFeedsRequest) returns (QueryAllFeedsResponse) {
option (google.api.http).get = "/jackal-dao/canine-chain/oracle/feeds";
rpc AllFeeds(QueryAllFeeds) returns (QueryAllFeedsResponse) {
option (google.api.http).get = "/jackal/canine-chain/oracle/feeds";
}
}

// QueryParamsRequest is request type for the Query/Params RPC method.
message QueryParamsRequest {}
message QueryParams {}

// QueryParamsResponse is response type for the Query/Params RPC method.
message QueryParamsResponse {
// params holds all the parameters of this module.
Params params = 1 [ (gogoproto.nullable) = false ];
}

message QueryFeedRequest {
message QueryFeed {
string name = 1;
}

Expand All @@ -43,7 +43,7 @@ message QueryFeedResponse {
Feed feed = 1 [ (gogoproto.nullable) = false ];
}

message QueryAllFeedsRequest {}
message QueryAllFeeds {}

message QueryAllFeedsResponse {
// params holds all the parameters of this module.
Expand Down
Loading
Loading