Using single rest_url instead of port and host.

pull/424/head
jMyles 2018-09-06 20:42:39 +02:00
parent 8f1497ba53
commit 1fbb577194
1 changed files with 3 additions and 3 deletions

View File

@ -55,17 +55,17 @@ class RestMiddleware:
def node_information(self, host, port): def node_information(self, host, port):
return requests.get("https://{}:{}/public_information".format(host, port), verify=False) # TODO: TLS-only. return requests.get("https://{}:{}/public_information".format(host, port), verify=False) # TODO: TLS-only.
def get_nodes_via_rest(self, address, port, announce_nodes=None, nodes_i_need=None): def get_nodes_via_rest(self, url, announce_nodes=None, nodes_i_need=None):
if nodes_i_need: if nodes_i_need:
# TODO: This needs to actually do something. # TODO: This needs to actually do something.
# Include node_ids in the request; if the teacher node doesn't know about the # Include node_ids in the request; if the teacher node doesn't know about the
# nodes matching these ids, then it will ask other nodes via the DHT or whatever. # nodes matching these ids, then it will ask other nodes via the DHT or whatever.
pass pass
if announce_nodes: if announce_nodes:
response = requests.post("https://{}:{}/node_metadata".format(address, port), response = requests.post("https://{}/node_metadata".format(address),
verify=False, verify=False,
data=bytes().join(bytes(n) for n in announce_nodes)) # TODO: TLS-only. data=bytes().join(bytes(n) for n in announce_nodes)) # TODO: TLS-only.
else: else:
response = requests.get("https://{}:{}/node_metadata".format(address, port), response = requests.get("https://{}node_metadata".format(address),
verify=False) # TODO: TLS-only. verify=False) # TODO: TLS-only.
return response return response