Typos and PISA-> teos

This commit is contained in:
Sergi Delgado Segura
2020-02-17 15:52:10 +01:00
parent 6970e74da5
commit 3cfe3edfa9
2 changed files with 9 additions and 9 deletions

View File

@@ -53,7 +53,7 @@ The API will return a `application/json` HTTP response code `200/OK` if the appo
The alpha release does not have authentication, payments nor rate limiting, therefore some self imposed restrictions apply: The alpha release does not have authentication, payments nor rate limiting, therefore some self imposed restrictions apply:
- `start_time` should be within the next 6 blocks `[current_time+1, current_time+6]`. - `start_time` should be within the next 6 blocks `[current_time+1, current_time+6]`.
- `end_time` cannot be bigger than (roughtly) a month. That is `4320` blocks on top of `start_time`. - `end_time` cannot be bigger than (roughly) a month. That is `4320` blocks on top of `start_time`.
- `encrypted_blob`s are limited to `2 kib`. - `encrypted_blob`s are limited to `2 kib`.

View File

@@ -165,7 +165,7 @@ def add_appointment(args):
logger.error("The returned appointment's signature is invalid") logger.error("The returned appointment's signature is invalid")
return False return False
logger.info("Appointment accepted and signed by PISA") logger.info("Appointment accepted and signed by the Eye of Satoshi")
# All good, store appointment and signature # All good, store appointment and signature
return save_appointment_receipt(appointment.to_dict(), signature) return save_appointment_receipt(appointment.to_dict(), signature)
@@ -232,18 +232,18 @@ def post_appointment(data):
None otherwise. None otherwise.
""" """
logger.info("Sending appointment to PISA") logger.info("Sending appointment to the Eye of Satoshi")
try: try:
add_appointment_endpoint = "{}:{}".format(pisa_api_server, pisa_api_port) add_appointment_endpoint = "{}:{}".format(pisa_api_server, pisa_api_port)
return requests.post(url=add_appointment_endpoint, json=json.dumps(data), timeout=5) return requests.post(url=add_appointment_endpoint, json=json.dumps(data), timeout=5)
except ConnectTimeout: except ConnectTimeout:
logger.error("Can't connect to PISA API. Connection timeout") logger.error("Can't connect to the Eye of Satoshi's API. Connection timeout")
return None return None
except ConnectionError: except ConnectionError:
logger.error("Can't connect to PISA API. Server cannot be reached") logger.error("Can't connect to the Eye of Satoshi's API. Server cannot be reached")
return None return None
except requests.exceptions.InvalidSchema: except requests.exceptions.InvalidSchema:
@@ -353,11 +353,11 @@ def get_appointment(locator):
return r.json() return r.json()
except ConnectTimeout: except ConnectTimeout:
logger.error("Can't connect to PISA API. Connection timeout") logger.error("Can't connect to the Eye of Satoshi's API. Connection timeout")
return None return None
except ConnectionError: except ConnectionError:
logger.error("Can't connect to PISA API. Server cannot be reached") logger.error("Can't connect to the Eye of Satoshi's API. Server cannot be reached")
return None return None
except requests.exceptions.InvalidSchema: except requests.exceptions.InvalidSchema:
@@ -372,8 +372,8 @@ def show_usage():
"USAGE: " "USAGE: "
"\n\tpython wt_cli.py [global options] command [command options] [arguments]" "\n\tpython wt_cli.py [global options] command [command options] [arguments]"
"\n\nCOMMANDS:" "\n\nCOMMANDS:"
"\n\tadd_appointment \tRegisters a json formatted appointment to the PISA server." "\n\tadd_appointment \tRegisters a json formatted appointment with the tower."
"\n\tget_appointment \tGets json formatted data about an appointment from the PISA server." "\n\tget_appointment \tGets json formatted data about an appointment from the tower."
"\n\thelp \t\t\tShows a list of commands or help for a specific command." "\n\thelp \t\t\tShows a list of commands or help for a specific command."
"\n\nGLOBAL OPTIONS:" "\n\nGLOBAL OPTIONS:"
"\n\t-s, --server \tAPI server where to send the requests. Defaults to https://teos.pisa.watch (modifiable in " "\n\t-s, --server \tAPI server where to send the requests. Defaults to https://teos.pisa.watch (modifiable in "