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

Re-organize network endpoints #2059

Merged
merged 26 commits into from
Jan 14, 2021
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d15ece6
refactor network endpoints
letmaik Jan 8, 2021
15e0f57
fix tests
letmaik Jan 8, 2021
6324aba
Merge branch 'master' into letmaik/network-rpcs
letmaik Jan 8, 2021
d99d902
fix json
letmaik Jan 8, 2021
2f46593
Merge branch 'letmaik/network-rpcs' of github.com:letmaik/CCF into le…
letmaik Jan 8, 2021
dcda185
formatting
letmaik Jan 8, 2021
9069be0
update schemas
letmaik Jan 8, 2021
1961155
minor fixes
letmaik Jan 8, 2021
a626469
Merge branch 'master' into letmaik/network-rpcs
letmaik Jan 8, 2021
6026849
Merge remote-tracking branch 'origin/master' into letmaik/network-rpcs
letmaik Jan 11, 2021
51820e3
update schemas
letmaik Jan 11, 2021
1ec67de
avoid template
letmaik Jan 11, 2021
021da70
formatting
letmaik Jan 11, 2021
b4eef84
optional query params & fix test
letmaik Jan 11, 2021
722f29a
support all-optional params in openapi
letmaik Jan 11, 2021
d528b6c
pr feedback
letmaik Jan 12, 2021
5abbaf9
Merge branch 'master' into letmaik/network-rpcs
letmaik Jan 12, 2021
d7eccc7
work around sphinxcontrib-openapi bug
letmaik Jan 12, 2021
9b431a0
Merge branch 'letmaik/network-rpcs' of github.com:letmaik/CCF into le…
letmaik Jan 12, 2021
687713e
Merge branch 'master' into letmaik/network-rpcs
letmaik Jan 12, 2021
85eb6d9
Merge branch 'master' into letmaik/network-rpcs
achamayou Jan 12, 2021
a0889e4
re-generate schemas
letmaik Jan 13, 2021
5049387
Merge branch 'master' into letmaik/network-rpcs
letmaik Jan 13, 2021
b91dc9f
Merge branch 'master' into letmaik/network-rpcs
achamayou Jan 13, 2021
e1ef9e8
Merge branch 'master' into letmaik/network-rpcs
achamayou Jan 13, 2021
02b49a0
Merge branch 'master' into letmaik/network-rpcs
achamayou Jan 13, 2021
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
168 changes: 0 additions & 168 deletions doc/schemas/app_openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,101 +94,6 @@
],
"type": "object"
},
"GetNetworkInfo__NodeInfo": {
"properties": {
"host": {
"$ref": "#/components/schemas/string"
},
"node_id": {
"$ref": "#/components/schemas/uint64"
},
"port": {
"$ref": "#/components/schemas/string"
}
},
"required": [
"node_id",
"host",
"port"
],
"type": "object"
},
"GetNetworkInfo__NodeInfo_array": {
"items": {
"$ref": "#/components/schemas/GetNetworkInfo__NodeInfo"
},
"type": "array"
},
"GetNetworkInfo__Out": {
"properties": {
"nodes": {
"$ref": "#/components/schemas/GetNetworkInfo__NodeInfo_array"
},
"primary_id": {
"$ref": "#/components/schemas/uint64"
}
},
"required": [
"nodes",
"primary_id"
],
"type": "object"
},
"GetNodesByRPCAddress__NodeInfo": {
"properties": {
"node_id": {
"$ref": "#/components/schemas/uint64"
},
"status": {
"$ref": "#/components/schemas/NodeStatus"
}
},
"required": [
"node_id",
"status"
],
"type": "object"
},
"GetNodesByRPCAddress__NodeInfo_array": {
"items": {
"$ref": "#/components/schemas/GetNodesByRPCAddress__NodeInfo"
},
"type": "array"
},
"GetNodesByRPCAddress__Out": {
"properties": {
"nodes": {
"$ref": "#/components/schemas/GetNodesByRPCAddress__NodeInfo_array"
}
},
"required": [
"nodes"
],
"type": "object"
},
"GetPrimaryInfo__Out": {
"properties": {
"current_view": {
"$ref": "#/components/schemas/int64"
},
"primary_host": {
"$ref": "#/components/schemas/string"
},
"primary_id": {
"$ref": "#/components/schemas/uint64"
},
"primary_port": {
"$ref": "#/components/schemas/string"
}
},
"required": [
"primary_id",
"primary_host",
"primary_port",
"current_view"
],
"type": "object"
},
"GetReceipt__Out": {
"properties": {
"receipt": {
Expand Down Expand Up @@ -264,13 +169,6 @@
],
"type": "object"
},
"NodeStatus": {
"enum": [
"PENDING",
"TRUSTED",
"RETIRED"
]
},
"Report": {
"properties": {
"histogram": {
Expand Down Expand Up @@ -830,72 +728,6 @@
]
}
},
"/network_info": {
"get": {
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetNetworkInfo__Out"
}
}
},
"description": "Default response description"
}
}
}
},
"/node/ids": {
"get": {
"parameters": [
{
"in": "query",
"name": "host",
"required": false,
"schema": {
"type": "string"
}
},
{
"in": "query",
"name": "port",
"required": false,
"schema": {
"type": "string"
}
}
],
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetNodesByRPCAddress__Out"
}
}
},
"description": "Default response description"
}
}
}
},
"/primary_info": {
"get": {
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetPrimaryInfo__Out"
}
}
},
"description": "Default response description"
}
}
}
},
"/receipt": {
"get": {
"parameters": [
Expand Down
168 changes: 0 additions & 168 deletions doc/schemas/gov_openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,101 +94,6 @@
],
"type": "object"
},
"GetNetworkInfo__NodeInfo": {
"properties": {
"host": {
"$ref": "#/components/schemas/string"
},
"node_id": {
"$ref": "#/components/schemas/uint64"
},
"port": {
"$ref": "#/components/schemas/string"
}
},
"required": [
"node_id",
"host",
"port"
],
"type": "object"
},
"GetNetworkInfo__NodeInfo_array": {
"items": {
"$ref": "#/components/schemas/GetNetworkInfo__NodeInfo"
},
"type": "array"
},
"GetNetworkInfo__Out": {
"properties": {
"nodes": {
"$ref": "#/components/schemas/GetNetworkInfo__NodeInfo_array"
},
"primary_id": {
"$ref": "#/components/schemas/uint64"
}
},
"required": [
"nodes",
"primary_id"
],
"type": "object"
},
"GetNodesByRPCAddress__NodeInfo": {
"properties": {
"node_id": {
"$ref": "#/components/schemas/uint64"
},
"status": {
"$ref": "#/components/schemas/NodeStatus"
}
},
"required": [
"node_id",
"status"
],
"type": "object"
},
"GetNodesByRPCAddress__NodeInfo_array": {
"items": {
"$ref": "#/components/schemas/GetNodesByRPCAddress__NodeInfo"
},
"type": "array"
},
"GetNodesByRPCAddress__Out": {
"properties": {
"nodes": {
"$ref": "#/components/schemas/GetNodesByRPCAddress__NodeInfo_array"
}
},
"required": [
"nodes"
],
"type": "object"
},
"GetPrimaryInfo__Out": {
"properties": {
"current_view": {
"$ref": "#/components/schemas/int64"
},
"primary_host": {
"$ref": "#/components/schemas/string"
},
"primary_id": {
"$ref": "#/components/schemas/uint64"
},
"primary_port": {
"$ref": "#/components/schemas/string"
}
},
"required": [
"primary_id",
"primary_host",
"primary_port",
"current_view"
],
"type": "object"
},
"GetReceipt__Out": {
"properties": {
"receipt": {
Expand Down Expand Up @@ -226,13 +131,6 @@
],
"type": "object"
},
"NodeStatus": {
"enum": [
"PENDING",
"TRUSTED",
"RETIRED"
]
},
"Proposal": {
"properties": {
"parameter": {
Expand Down Expand Up @@ -598,72 +496,6 @@
}
}
},
"/network_info": {
"get": {
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetNetworkInfo__Out"
}
}
},
"description": "Default response description"
}
}
}
},
"/node/ids": {
"get": {
"parameters": [
{
"in": "query",
"name": "host",
"required": false,
"schema": {
"type": "string"
}
},
{
"in": "query",
"name": "port",
"required": false,
"schema": {
"type": "string"
}
}
],
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetNodesByRPCAddress__Out"
}
}
},
"description": "Default response description"
}
}
}
},
"/primary_info": {
"get": {
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetPrimaryInfo__Out"
}
}
},
"description": "Default response description"
}
}
}
},
"/proposals": {
"post": {
"requestBody": {
Expand Down
Loading