Skip to content
Snippets Groups Projects
Commit 52f632d0 authored by TechCoderX's avatar TechCoderX
Browse files

rename steemd to hived

parent 75f61aaf
No related branches found
No related tags found
3 merge requests!9finally merge old fixes with master,!6cleanup merge,!5Rename default namespace & update README
Showing
with 126 additions and 126 deletions
...@@ -6,91 +6,91 @@ ...@@ -6,91 +6,91 @@
}, },
"upstreams": [ "upstreams": [
{ {
"name": "steemd", "name": "hived",
"translate_to_appbase": true, "translate_to_appbase": true,
"urls": [ "urls": [
[ [
"steemd", "hived",
"https://api.steemit.com" "https://api.hive.blog"
] ]
], ],
"ttls": [ "ttls": [
[ [
"steemd", "hived",
3 3
], ],
[ [
"steemd.login_api", "hived.login_api",
-1 -1
], ],
[ [
"steemd.network_broadcast_api", "hived.network_broadcast_api",
-1 -1
], ],
[ [
"steemd.follow_api", "hived.follow_api",
10 10
], ],
[ [
"steemd.market_history_api", "hived.market_history_api",
1 1
], ],
[ [
"steemd.database_api", "hived.database_api",
3 3
], ],
[ [
"steemd.database_api.get_block", "hived.database_api.get_block",
-2 -2
], ],
[ [
"steemd.database_api.get_block_header", "hived.database_api.get_block_header",
-2 -2
], ],
[ [
"steemd.database_api.get_content", "hived.database_api.get_content",
1 1
], ],
[ [
"steemd.database_api.get_state", "hived.database_api.get_state",
1 1
], ],
[ [
"steemd.database_api.get_state.params=['/trending']", "hived.database_api.get_state.params=['/trending']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['trending']", "hived.database_api.get_state.params=['trending']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/hot']", "hived.database_api.get_state.params=['/hot']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/welcome']", "hived.database_api.get_state.params=['/welcome']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/promoted']", "hived.database_api.get_state.params=['/promoted']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/created']", "hived.database_api.get_state.params=['/created']",
10 10
], ],
[ [
"steemd.database_api.get_dynamic_global_properties", "hived.database_api.get_dynamic_global_properties",
1 1
] ]
], ],
"timeouts": [ "timeouts": [
[ [
"steemd", "hived",
5 5
], ],
[ [
"steemd.network_broadcast_api", "hived.network_broadcast_api",
0 0
] ]
] ]
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
"urls": [ "urls": [
[ [
"appbase", "appbase",
"https://api.steemit.com" "https://api.hive.blog"
] ]
], ],
"ttls": [ "ttls": [
......
...@@ -6,23 +6,23 @@ ...@@ -6,23 +6,23 @@
}, },
"upstreams": [ "upstreams": [
{ {
"name": "steemd", "name": "hived",
"translate_to_appbase": true, "translate_to_appbase": true,
"urls": [ "urls": [
[ [
"steemd", "hived",
"https://your.steemd.url" "https://your.hived.url"
] ]
], ],
"ttls": [ "ttls": [
[ [
"steemd", "hived",
3 3
] ]
], ],
"timeouts": [ "timeouts": [
[ [
"steemd", "hived",
3 3
] ]
] ]
...@@ -32,19 +32,19 @@ ...@@ -32,19 +32,19 @@
"urls": [ "urls": [
[ [
"appbase", "appbase",
"https://your.steemd.url" "https://your.hived.url"
], ],
[ [
"appbase.account_history_api", "appbase.account_history_api",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.condenser_api.get_account_history", "appbase.condenser_api.get_account_history",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.condenser_api.get_ops_in_block", "appbase.condenser_api.get_ops_in_block",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.condenser_api.get_followers", "appbase.condenser_api.get_followers",
...@@ -124,19 +124,19 @@ ...@@ -124,19 +124,19 @@
], ],
[ [
"appbase.condenser_api.get_state.params=['witnesses']", "appbase.condenser_api.get_state.params=['witnesses']",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.condenser_api.get_state.params=['/witnesses']", "appbase.condenser_api.get_state.params=['/witnesses']",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.condenser_api.get_state.params=['/~witnesses']", "appbase.condenser_api.get_state.params=['/~witnesses']",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.condenser_api.get_state.params=['~witnesses']", "appbase.condenser_api.get_state.params=['~witnesses']",
"https://your.account.history.steemd.url" "https://your.account.history.hived.url"
], ],
[ [
"appbase.follow_api", "appbase.follow_api",
......
...@@ -132,8 +132,8 @@ mypy: ## run mypy type checking on python files ...@@ -132,8 +132,8 @@ mypy: ## run mypy type checking on python files
http --json :9000/ id:=1 jsonrpc=2.0 method=get_block params:='[1000]' http --json :9000/ id:=1 jsonrpc=2.0 method=get_block params:='[1000]'
.PHONY: test-local-steemd-calls .PHONY: test-local-hived-calls
test-local-steemd-calls: test-local-hived-calls:
pipenv run pytest -vv tests/test_responses.py::test_steemd_responses --jussiurl http://localhost:9000 pipenv run pytest -vv tests/test_responses.py::test_steemd_responses --jussiurl http://localhost:9000
.PHONY: test-local-appbase-calls .PHONY: test-local-appbase-calls
...@@ -154,7 +154,7 @@ test-live-staging-appbase-calls: ...@@ -154,7 +154,7 @@ test-live-staging-appbase-calls:
.PHONY: test-live-prod-appbase-calls .PHONY: test-live-prod-appbase-calls
test-live-prod-appbase-calls: test-live-prod-appbase-calls:
pipenv run pytest --maxfail=1 tests/test_responses.py::test_appbase_responses --jussiurl https://api.steemit.com pipenv run pytest --maxfail=1 tests/test_responses.py::test_appbase_responses --jussiurl https://api.hive.blog
./perf: ./perf:
......
...@@ -29,7 +29,7 @@ Content-Type: application/json ...@@ -29,7 +29,7 @@ Content-Type: application/json
``` ```
### Default Namespace ### Default Namespace
Any json-rpc method with no period in the method name is presumed to be in the "steemd" namespace and will be forwarded to a steemd endpoint: Any json-rpc method with no period in the method name is presumed to be in the "hived" namespace and will be forwarded to a hived endpoint:
``` ```
POST / HTTP/1.1 POST / HTTP/1.1
......
...@@ -93,7 +93,7 @@ def chunkify(iterable, chunksize=3000): ...@@ -93,7 +93,7 @@ def chunkify(iterable, chunksize=3000):
class AsyncClient(object): class AsyncClient(object):
def __init__(self, *, url=None, **kwargs): def __init__(self, *, url=None, **kwargs):
self.url = url or os.environ.get( self.url = url or os.environ.get(
'STEEMD_HTTP_URL', 'https://steemd.steemitdev.com') 'STEEMD_HTTP_URL', 'https://api.hive.blog')
self.kwargs = kwargs self.kwargs = kwargs
self.session = kwargs.get('session', None) self.session = kwargs.get('session', None)
self.connector = get_in(kwargs, ['session', 'connector']) self.connector = get_in(kwargs, ['session', 'connector'])
...@@ -234,7 +234,7 @@ class AsyncClient(object): ...@@ -234,7 +234,7 @@ class AsyncClient(object):
@property @property
def concurrent_connections(self): def concurrent_connections(self):
"""number of tcp connections to steemd""" """number of tcp connections to hived"""
return self.connector.limit return self.connector.limit
@property @property
......
...@@ -80,7 +80,7 @@ class SimpleSteemAPIClient(object): ...@@ -80,7 +80,7 @@ class SimpleSteemAPIClient(object):
tcp_keepalive=True, tcp_keepalive=True,
**kwargs): **kwargs):
url = url or os.environ.get('STEEMD_HTTP_URL', url = url or os.environ.get('STEEMD_HTTP_URL',
'https://steemd.steemitdev.com') 'https://api.hive.blog')
self.url = url self.url = url
self.hostname = urlparse(url).hostname self.hostname = urlparse(url).hostname
self.return_with_args = kwargs.get('return_with_args', False) self.return_with_args = kwargs.get('return_with_args', False)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Method Settings Method Settings
--------------- ---------------
- Each tuple in the METHOD_SETTING's list of tuples is a setting - Each tuple in the METHOD_SETTING's list of tuples is a setting
- Each setting is a two-tuple of `prefix` and `ttl`, eg, ('steemd.database_api.get_block',1) - Each setting is a two-tuple of `prefix` and `ttl`, eg, ('hived.database_api.get_block',1)
- Settings are stored in a trie structure, the longest matching prefix for a method is it's setting - Settings are stored in a trie structure, the longest matching prefix for a method is it's setting
- TTL is an integer value in seconds. Integers <= 0 have special meaning - TTL is an integer value in seconds. Integers <= 0 have special meaning
- A TTL of `0` won't expire - A TTL of `0` won't expire
......
...@@ -54,12 +54,12 @@ def block_num_from_jsonrpc_response( ...@@ -54,12 +54,12 @@ def block_num_from_jsonrpc_response(
if previous: if previous:
return int(str(previous)[:8], base=16) + 1 return int(str(previous)[:8], base=16) + 1
# for steemd get_block # for hived get_block
block_id = get_in(['result', 'block_id'], jsonrpc_response) block_id = get_in(['result', 'block_id'], jsonrpc_response)
if block_id: if block_id:
return int(str(block_id)[:8], base=16) return int(str(block_id)[:8], base=16)
# for steemd get_block_header # for hived get_block_header
previous = get_in(['result', 'previous'], previous = get_in(['result', 'previous'],
jsonrpc_response) jsonrpc_response)
if previous: if previous:
......
...@@ -88,7 +88,7 @@ class _Upstreams(object): ...@@ -88,7 +88,7 @@ class _Upstreams(object):
@functools.lru_cache(8192) @functools.lru_cache(8192)
def url(self, request_urn) -> str: def url(self, request_urn) -> str:
# certain steemd.get_state paths must be routed differently # certain hived.get_state paths must be routed differently
if (request_urn.api in ['database_api', 'condenser_api'] if (request_urn.api in ['database_api', 'condenser_api']
and request_urn.method == 'get_state' and request_urn.method == 'get_state'
and isinstance(request_urn.params, list) and isinstance(request_urn.params, list)
......
...@@ -117,7 +117,7 @@ def _parse_jrpc(single_jsonrpc_request) -> dict: ...@@ -117,7 +117,7 @@ def _parse_jrpc(single_jsonrpc_request) -> dict:
if method != 'call': if method != 'call':
return { return {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': method, 'method': method,
'params': params 'params': params
...@@ -132,12 +132,12 @@ def _parse_jrpc(single_jsonrpc_request) -> dict: ...@@ -132,12 +132,12 @@ def _parse_jrpc(single_jsonrpc_request) -> dict:
if api == 'condenser_api' or isinstance(_params, dict) or api == 'jsonrpc': if api == 'condenser_api' or isinstance(_params, dict) or api == 'jsonrpc':
namespace = 'appbase' namespace = 'appbase'
else: else:
namespace = 'steemd' namespace = 'hived'
if isinstance(api, int): if isinstance(api, int):
try: try:
api = STEEMD_NUMERIC_API_MAPPING[api] api = STEEMD_NUMERIC_API_MAPPING[api]
except IndexError: except IndexError:
raise InvalidNamespaceAPIError(namespace='steemd', raise InvalidNamespaceAPIError(namespace='hived',
api=api) api=api)
return { return {
......
...@@ -112,17 +112,17 @@ def is_valid_non_error_jussi_response( ...@@ -112,17 +112,17 @@ def is_valid_non_error_jussi_response(
def is_get_block_request(request: JSONRPCRequest) -> bool: def is_get_block_request(request: JSONRPCRequest) -> bool:
return request.urn.namespace in ('steemd', 'appbase') and request.urn.method == 'get_block' return request.urn.namespace in ('hived', 'appbase') and request.urn.method == 'get_block'
def is_get_block_header_request(request: JSONRPCRequest) -> bool: def is_get_block_header_request(request: JSONRPCRequest) -> bool:
return request.urn.namespace in ( return request.urn.namespace in (
'steemd', 'appbase') and request.urn.method == 'get_block_header' 'hived', 'appbase') and request.urn.method == 'get_block_header'
def is_get_dynamic_global_properties_request(request: JSONRPCRequest) -> bool: def is_get_dynamic_global_properties_request(request: JSONRPCRequest) -> bool:
return request.urn.namespace in ( return request.urn.namespace in (
'steemd', 'appbase') and request.urn.method == 'get_dynamic_global_properties' 'hived', 'appbase') and request.urn.method == 'get_dynamic_global_properties'
def is_valid_get_block_response( def is_valid_get_block_response(
......
...@@ -103,7 +103,7 @@ def jrpc_response_schema(): ...@@ -103,7 +103,7 @@ def jrpc_response_schema():
@pytest.fixture @pytest.fixture
def steemd_response_schema(): def steemd_response_schema():
with open(os.path.join(SCHEMA_DIR, 'steemd-response-schema.json')) as f: with open(os.path.join(SCHEMA_DIR, 'hived-response-schema.json')) as f:
return ujson.load(f) return ujson.load(f)
...@@ -116,7 +116,7 @@ with open(os.path.join(CONFIGS_DIR, 'TEST_UPSTREAM_CONFIG.json')) as f: ...@@ -116,7 +116,7 @@ with open(os.path.join(CONFIGS_DIR, 'TEST_UPSTREAM_CONFIG.json')) as f:
# ------------------------ # ------------------------
def steemd_requests_and_responses(): def steemd_requests_and_responses():
with open(os.path.join(REQS_AND_RESPS_DIR, 'steemd.json')) as f: with open(os.path.join(REQS_AND_RESPS_DIR, 'hived.json')) as f:
return ujson.load(f) return ujson.load(f)
...@@ -1126,24 +1126,24 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1126,24 +1126,24 @@ URN_TEST_REQUEST_DICTS = [
), ),
# -------- STEEMD BARE METHOD ---------------- # -------- STEEMD BARE METHOD ----------------
# steemd, bare method, no params # hived, bare method, no params
({ ({
'id': 5020, 'id': 5020,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
'method': 'get_dynamic_global_properties' 'method': 'get_dynamic_global_properties'
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'get_dynamic_global_properties', 'method': 'get_dynamic_global_properties',
'params': _empty 'params': _empty
}, },
'steemd.database_api.get_dynamic_global_properties', 'hived.database_api.get_dynamic_global_properties',
'wss://steemd.steemitdev.com', 'https://api.hive.blog',
1, 1,
3 3
), ),
# steemd, bare method, empty params list # hived, bare method, empty params list
({ ({
'id': 5021, 'id': 5021,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
...@@ -1151,17 +1151,17 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1151,17 +1151,17 @@ URN_TEST_REQUEST_DICTS = [
'params': [] 'params': []
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'get_dynamic_global_properties', 'method': 'get_dynamic_global_properties',
'params': [] 'params': []
}, },
'steemd.database_api.get_dynamic_global_properties.params=[]', 'hived.database_api.get_dynamic_global_properties.params=[]',
'wss://steemd.steemitdev.com', 'https://api.hive.blog',
1, 1,
3 3
), ),
# steemd, bare method, params list # hived, bare method, params list
({ ({
'id': 5022, 'id': 5022,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
...@@ -1169,18 +1169,18 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1169,18 +1169,18 @@ URN_TEST_REQUEST_DICTS = [
'params': [1] 'params': [1]
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'get_block', 'method': 'get_block',
'params': [1] 'params': [1]
}, },
'steemd.database_api.get_block.params=[1]', 'hived.database_api.get_block.params=[1]',
'wss://steemd.steemitdev.com', 'https://api.hive.blog',
-2, -2,
3 3
), ),
# steemd, bare_method, account transfer url # hived, bare_method, account transfer url
({ ({
"id": 5023, "id": 5023,
"jsonrpc": "2.0", "jsonrpc": "2.0",
...@@ -1188,12 +1188,12 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1188,12 +1188,12 @@ URN_TEST_REQUEST_DICTS = [
"params": ["/@justinw/transfers"] "params": ["/@justinw/transfers"]
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'get_state', 'method': 'get_state',
'params': ["/@justinw/transfers"] 'params': ["/@justinw/transfers"]
}, },
'steemd.database_api.get_state.params=["\/@justinw\/transfers"]', 'hived.database_api.get_state.params=["\/@justinw\/transfers"]',
'account_transfer_url', 'account_transfer_url',
1, 1,
3 3
...@@ -1203,7 +1203,7 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1203,7 +1203,7 @@ URN_TEST_REQUEST_DICTS = [
# -------- STEEMD METHOD=CALL ---------------- # -------- STEEMD METHOD=CALL ----------------
# steemd, method=call, empty params list # hived, method=call, empty params list
({ ({
'id': 5024, 'id': 5024,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
...@@ -1211,17 +1211,17 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1211,17 +1211,17 @@ URN_TEST_REQUEST_DICTS = [
'params': ['database_api', 'get_account_count', []] 'params': ['database_api', 'get_account_count', []]
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'get_account_count', 'method': 'get_account_count',
'params': [] 'params': []
}, },
'steemd.database_api.get_account_count.params=[]', 'hived.database_api.get_account_count.params=[]',
'wss://steemd.steemitdev.com', 'https://api.hive.blog',
3, 3,
3 3
), ),
# steemd numeric apis # hived numeric apis
({ ({
'id': 5025, 'id': 5025,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
...@@ -1229,13 +1229,13 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1229,13 +1229,13 @@ URN_TEST_REQUEST_DICTS = [
'params': [1, "login", ["", ""]] 'params': [1, "login", ["", ""]]
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'login_api', 'api': 'login_api',
'method': 'login', 'method': 'login',
'params': ["", ""] 'params': ["", ""]
}, },
'steemd.login_api.login.params=["",""]', 'hived.login_api.login.params=["",""]',
'wss://steemd.steemitdev.com', 'https://api.hive.blog',
-1, -1,
3 3
), ),
...@@ -1246,17 +1246,17 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1246,17 +1246,17 @@ URN_TEST_REQUEST_DICTS = [
'params': [0, "find_accounts", []] 'params': [0, "find_accounts", []]
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'find_accounts', 'method': 'find_accounts',
'params': [] 'params': []
}, },
'steemd.database_api.find_accounts.params=[]', 'hived.database_api.find_accounts.params=[]',
'wss://steemd.steemitdev.com', 'https://api.hive.blog',
3, 3,
3 3
), ),
# steemd, method=call, account transfer url # hived, method=call, account transfer url
({ ({
"id": 5027, "id": 5027,
"jsonrpc": "2.0", "jsonrpc": "2.0",
...@@ -1264,12 +1264,12 @@ URN_TEST_REQUEST_DICTS = [ ...@@ -1264,12 +1264,12 @@ URN_TEST_REQUEST_DICTS = [
"params": ["database_api", "get_state", [r"/@justinw/transfers"]] "params": ["database_api", "get_state", [r"/@justinw/transfers"]]
}, },
{ {
'namespace': 'steemd', 'namespace': 'hived',
'api': 'database_api', 'api': 'database_api',
'method': 'get_state', 'method': 'get_state',
'params': ["/@justinw/transfers"] 'params': ["/@justinw/transfers"]
}, },
'steemd.database_api.get_state.params=["\/@justinw\/transfers"]', 'hived.database_api.get_state.params=["\/@justinw\/transfers"]',
'account_transfer_url', 'account_transfer_url',
1, 1,
3 3
......
...@@ -4,90 +4,90 @@ ...@@ -4,90 +4,90 @@
}, },
"upstreams": [ "upstreams": [
{ {
"name": "steemd", "name": "hived",
"urls": [ "urls": [
[ [
"steemd", "hived",
"wss://steemd.steemitdev.com" "https://api.hive.blog"
] ]
], ],
"ttls": [ "ttls": [
[ [
"steemd", "hived",
3 3
], ],
[ [
"steemd.login_api", "hived.login_api",
-1 -1
], ],
[ [
"steemd.network_broadcast_api", "hived.network_broadcast_api",
-1 -1
], ],
[ [
"steemd.follow_api", "hived.follow_api",
10 10
], ],
[ [
"steemd.market_history_api", "hived.market_history_api",
1 1
], ],
[ [
"steemd.database_api", "hived.database_api",
3 3
], ],
[ [
"steemd.database_api.get_block", "hived.database_api.get_block",
-2 -2
], ],
[ [
"steemd.database_api.get_block_header", "hived.database_api.get_block_header",
-2 -2
], ],
[ [
"steemd.database_api.get_content", "hived.database_api.get_content",
1 1
], ],
[ [
"steemd.database_api.get_state", "hived.database_api.get_state",
1 1
], ],
[ [
"steemd.database_api.get_state.params=['/trending']", "hived.database_api.get_state.params=['/trending']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['trending']", "hived.database_api.get_state.params=['trending']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/hot']", "hived.database_api.get_state.params=['/hot']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/welcome']", "hived.database_api.get_state.params=['/welcome']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/promoted']", "hived.database_api.get_state.params=['/promoted']",
30 30
], ],
[ [
"steemd.database_api.get_state.params=['/created']", "hived.database_api.get_state.params=['/created']",
10 10
], ],
[ [
"steemd.database_api.get_dynamic_global_properties", "hived.database_api.get_dynamic_global_properties",
1 1
] ]
], ],
"timeouts": [ "timeouts": [
[ [
"steemd", "hived",
3 3
], ],
[ [
"steemd.network_broadcast_api", "hived.network_broadcast_api",
0 0
] ]
] ]
......
...@@ -85,7 +85,7 @@ async def test_cache_response_middleware(test_cli): ...@@ -85,7 +85,7 @@ async def test_cache_response_middleware(test_cli):
response = await test_cli.post('/', json=req) response = await test_cli.post('/', json=req)
assert await response.json() == expected_steemd_response assert await response.json() == expected_steemd_response
response = await test_cli.post('/', json=req) response = await test_cli.post('/', json=req)
assert response.headers['x-jussi-cache-hit'] == 'steemd.database_api.get_dynamic_global_properties' assert response.headers['x-jussi-cache-hit'] == 'hived.database_api.get_dynamic_global_properties'
async def test_mocked_cache_response_middleware(mocked_app_test_cli): async def test_mocked_cache_response_middleware(mocked_app_test_cli):
...@@ -96,5 +96,5 @@ async def test_mocked_cache_response_middleware(mocked_app_test_cli): ...@@ -96,5 +96,5 @@ async def test_mocked_cache_response_middleware(mocked_app_test_cli):
assert await response.json() == expected_response assert await response.json() == expected_response
response = await test_cli.post('/', json=req, headers={'x-jussi-request-id': '1'}) response = await test_cli.post('/', json=req, headers={'x-jussi-request-id': '1'})
assert response.headers['x-jussi-cache-hit'] == 'steemd.database_api.get_dynamic_global_properties' assert response.headers['x-jussi-cache-hit'] == 'hived.database_api.get_dynamic_global_properties'
assert await response.json() == expected_response assert await response.json() == expected_response
...@@ -22,11 +22,11 @@ correct_get_block_1000_response = { ...@@ -22,11 +22,11 @@ correct_get_block_1000_response = {
'jsonrpc_request, expected', 'jsonrpc_request, expected',
[ [
( (
# single jsonrpc steemd request # single jsonrpc hived request
dict(id=1, jsonrpc='2.0', method='get_block', params=[1000]), dict(id=1, jsonrpc='2.0', method='get_block', params=[1000]),
correct_get_block_1000_response correct_get_block_1000_response
), ),
# batch jsronrpc steemd request # batch jsronrpc hived request
( (
[ [
dict(id=1, jsonrpc='2.0', method='get_block', params=[1000]), dict(id=1, jsonrpc='2.0', method='get_block', params=[1000]),
...@@ -35,7 +35,7 @@ correct_get_block_1000_response = { ...@@ -35,7 +35,7 @@ correct_get_block_1000_response = {
[correct_get_block_1000_response, correct_get_block_1000_response] [correct_get_block_1000_response, correct_get_block_1000_response]
), ),
( (
# single jsonrpc old-style steemd requests # single jsonrpc old-style hived requests
dict( dict(
id=1, id=1,
jsonrpc='2.0', jsonrpc='2.0',
...@@ -44,7 +44,7 @@ correct_get_block_1000_response = { ...@@ -44,7 +44,7 @@ correct_get_block_1000_response = {
correct_get_block_1000_response correct_get_block_1000_response
), ),
( (
# batch jsonrpc old-style steemd request # batch jsonrpc old-style hived request
[ [
dict( dict(
id=1, id=1,
...@@ -60,7 +60,7 @@ correct_get_block_1000_response = { ...@@ -60,7 +60,7 @@ correct_get_block_1000_response = {
[correct_get_block_1000_response, correct_get_block_1000_response] [correct_get_block_1000_response, correct_get_block_1000_response]
), ),
( (
# batch jsonrpc mixed-style steemd request # batch jsonrpc mixed-style hived request
[ [
dict(id=1, jsonrpc='2.0', method='get_block', params=[1000]), dict(id=1, jsonrpc='2.0', method='get_block', params=[1000]),
dict(id=1, jsonrpc='2.0', method='call', params=[ dict(id=1, jsonrpc='2.0', method='call', params=[
......
...@@ -21,7 +21,7 @@ correct_get_block_1000_response = { ...@@ -21,7 +21,7 @@ correct_get_block_1000_response = {
test_request = { test_request = {
'id': 1, 'id': 1,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
'method': 'steemd.fake_method' 'method': 'hived.fake_method'
} }
error_response1 = {'id': 1, 'jsonrpc': '2.0', 'error': { error_response1 = {'id': 1, 'jsonrpc': '2.0', 'error': {
......
...@@ -158,7 +158,7 @@ def test_urn_parts_in_post_response_headers(): ...@@ -158,7 +158,7 @@ def test_urn_parts_in_post_response_headers():
_, response = app.test_client.post('/post', json=req) _, response = app.test_client.post('/post', json=req)
assert 'x-jussi-request-id' in response.headers assert 'x-jussi-request-id' in response.headers
assert response.headers['x-jussi-namespace'] == 'steemd', f'{response.headers}' assert response.headers['x-jussi-namespace'] == 'hived', f'{response.headers}'
assert response.headers['x-jussi-api'] == 'database_api', f'{response.headers}' assert response.headers['x-jussi-api'] == 'database_api', f'{response.headers}'
assert response.headers['x-jussi-method'] == 'get_block', f'{response.headers}' assert response.headers['x-jussi-method'] == 'get_block', f'{response.headers}'
assert response.headers['x-jussi-params'] == '[1000]', f'{response.headers}' assert response.headers['x-jussi-params'] == '[1000]', f'{response.headers}'
......
...@@ -45,7 +45,7 @@ def test_parse_jrpc_errors(jsonrpc_request, expected): ...@@ -45,7 +45,7 @@ def test_parse_jrpc_errors(jsonrpc_request, expected):
def test_parse_jrpc_namespace_is_steemd(steemd_request_and_response): def test_parse_jrpc_namespace_is_steemd(steemd_request_and_response):
req, resp = steemd_request_and_response req, resp = steemd_request_and_response
result = _parse_jrpc(req) result = _parse_jrpc(req)
assert result['namespace'] == 'steemd' assert result['namespace'] == 'hived'
def test_parse_jrpc_namespace_is_appbase(appbase_request_and_response): def test_parse_jrpc_namespace_is_appbase(appbase_request_and_response):
......
...@@ -17,30 +17,30 @@ def test_urns(urn_test_request_dict): ...@@ -17,30 +17,30 @@ def test_urns(urn_test_request_dict):
@pytest.mark.parametrize("jsonrpc_request,expected", [ @pytest.mark.parametrize("jsonrpc_request,expected", [
# steemd, bare_method # hived, bare_method
({'id': 1, ({'id': 1,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
'method': 'get_account_count', 'method': 'get_account_count',
'params': []}, 'params': []},
'steemd.database_api.get_account_count.params=[]' 'hived.database_api.get_account_count.params=[]'
), ),
# steemd, method=call # hived, method=call
({ ({
'id': 1, 'id': 1,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
'method': 'call', 'method': 'call',
'params': ['database_api', 'get_account_count', []] 'params': ['database_api', 'get_account_count', []]
}, },
'steemd.database_api.get_account_count.params=[]' 'hived.database_api.get_account_count.params=[]'
), ),
# steemd, method=call, numeric api # hived, method=call, numeric api
({ ({
'id': 1, 'id': 1,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
'method': 'call', 'method': 'call',
'params': [0, 'get_account_count', []] 'params': [0, 'get_account_count', []]
}, },
'steemd.database_api.get_account_count.params=[]' 'hived.database_api.get_account_count.params=[]'
), ),
# appbase, dotted method, condenser api # appbase, dotted method, condenser api
({ ({
...@@ -50,7 +50,7 @@ def test_urns(urn_test_request_dict): ...@@ -50,7 +50,7 @@ def test_urns(urn_test_request_dict):
}, },
'appbase.condenser_api.appbase_method.params=[]' 'appbase.condenser_api.appbase_method.params=[]'
), ),
# steemd, condenser api, method=call # hived, condenser api, method=call
({ ({
'id': 1, 'id': 1,
'jsonrpc': '2.0', 'jsonrpc': '2.0',
...@@ -107,9 +107,9 @@ def test_urn_params_empty_dict(jsonrpc_request, expected): ...@@ -107,9 +107,9 @@ def test_urn_params_empty_dict(jsonrpc_request, expected):
@pytest.mark.parametrize("jsonrpc_request,expected", [ @pytest.mark.parametrize("jsonrpc_request,expected", [
# steemd, bare_method # hived, bare_method
({'id': 1, 'jsonrpc': '2.0', 'method': 'get_dynamic_global_properties'}, ({'id': 1, 'jsonrpc': '2.0', 'method': 'get_dynamic_global_properties'},
'steemd.database_api.get_dynamic_global_properties' 'hived.database_api.get_dynamic_global_properties'
), ),
# appbase, dotted method, non-condenser api # appbase, dotted method, non-condenser api
({'id': 1, 'jsonrpc': '2.0', 'method': 'non_condenser_api.appbase_method'}, ({'id': 1, 'jsonrpc': '2.0', 'method': 'non_condenser_api.appbase_method'},
...@@ -148,4 +148,4 @@ def test_urn_pairs(steemd_method_pairs): ...@@ -148,4 +148,4 @@ def test_urn_pairs(steemd_method_pairs):
old_urn = str(from_request(old)) old_urn = str(from_request(old))
new_urn = str(from_request(new)) new_urn = str(from_request(new))
assert old_urn == new_urn assert old_urn == new_urn
assert old_urn.startswith('steemd.database_api') assert old_urn.startswith('hived.database_api')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment