From b22c2320f66a395d3391b5e22be94bcb580329f8 Mon Sep 17 00:00:00 2001 From: Moul <moul@moul.re> Date: Thu, 6 May 2021 23:16:49 +0200 Subject: [PATCH] [mod] #160: Define functions in examples The function names are based on the files' names Pylint: Use unused variables --- examples/create_public_key.py | 6 +- examples/listen_ws2p.py | 4 +- examples/load_binary_encrypted_message.py | 5 +- examples/load_binary_signed_message.py | 7 +- .../load_cleartext_ascii_armor_message.py | 6 +- examples/load_credentials_file.py | 6 +- .../load_encrypted_ascii_armor_message.py | 6 +- examples/load_local_blockchain.py | 18 +++-- examples/load_scuttlebutt_file.py | 6 +- examples/request_available_nodes.py | 4 +- examples/request_data.py | 4 +- examples/request_data_async.py | 5 +- examples/request_data_elasticsearch.py | 4 +- examples/request_data_graphql.py | 4 +- examples/request_web_socket_block.py | 4 +- examples/request_ws2p.py | 4 +- examples/save_and_load_private_key_file.py | 44 ++++++------ .../save_and_load_private_key_file_ewif.py | 69 ++++++++++--------- .../save_and_load_private_key_file_pubsec.py | 60 ++++++++-------- .../save_and_load_private_key_file_wif.py | 61 ++++++++-------- examples/save_binary_encrypted_message.py | 5 +- examples/save_binary_signed_message.py | 7 +- .../save_cleartext_ascii_armor_message.py | 5 +- .../save_encrypted_ascii_armor_message.py | 5 +- examples/save_revoke_document.py | 4 +- examples/send_certification.py | 4 +- examples/send_identity.py | 4 +- examples/send_membership.py | 4 +- examples/send_transaction.py | 4 +- 29 files changed, 210 insertions(+), 159 deletions(-) diff --git a/examples/create_public_key.py b/examples/create_public_key.py index 8c088a65..7ed15a28 100644 --- a/examples/create_public_key.py +++ b/examples/create_public_key.py @@ -20,7 +20,7 @@ from duniterpy.key import SigningKey ################################################ -if __name__ == "__main__": +def create_public_key(): # prompt hidden user entry salt = getpass.getpass("Enter your passphrase (salt): ") @@ -32,3 +32,7 @@ if __name__ == "__main__": # Display your public key print("Public key for your credentials: %s" % key.pubkey) + + +if __name__ == "__main__": + create_public_key() diff --git a/examples/listen_ws2p.py b/examples/listen_ws2p.py index 6a8c4f24..2faedaee 100644 --- a/examples/listen_ws2p.py +++ b/examples/listen_ws2p.py @@ -37,7 +37,7 @@ CURRENCY = "g1-test" ################################################ -def main(): +def listen_ws2p(): """ Main code """ @@ -101,4 +101,4 @@ def main(): if __name__ == "__main__": - main() + listen_ws2p() diff --git a/examples/load_binary_encrypted_message.py b/examples/load_binary_encrypted_message.py index 19447c27..1853cafa 100644 --- a/examples/load_binary_encrypted_message.py +++ b/examples/load_binary_encrypted_message.py @@ -20,8 +20,8 @@ import sys from duniterpy.key import SigningKey -if __name__ == "__main__": +def load_binary_encrypted_message(): if len(sys.argv) < 2: print( """ @@ -54,3 +54,6 @@ if __name__ == "__main__": message = str(error) print(message) + +if __name__ == "__main__": + load_binary_encrypted_message() diff --git a/examples/load_binary_signed_message.py b/examples/load_binary_signed_message.py index 57cea48d..857390fa 100644 --- a/examples/load_binary_signed_message.py +++ b/examples/load_binary_signed_message.py @@ -19,8 +19,7 @@ import sys from duniterpy.key import VerifyingKey -if __name__ == "__main__": - +def load_binary_signed_message(): if len(sys.argv) < 2: print( """ @@ -48,3 +47,7 @@ if __name__ == "__main__": message = str(error) print(message) + + +if __name__ == "__main__": + load_binary_signed_message() diff --git a/examples/load_cleartext_ascii_armor_message.py b/examples/load_cleartext_ascii_armor_message.py index 339f24ee..cd87bc03 100644 --- a/examples/load_cleartext_ascii_armor_message.py +++ b/examples/load_cleartext_ascii_armor_message.py @@ -23,7 +23,7 @@ CLEARTEXT_AA_MESSAGE_PATH = "/tmp/duniter_cleartext_aa_message.txt" ################################################ -if __name__ == "__main__": +def load_cleartext_ascii_armor_message(): # Ask public key of the issuer pubkeyBase58 = input("Enter public key of the message issuer: ") @@ -44,3 +44,7 @@ if __name__ == "__main__": + "----------------------------------" ) print(result) + + +if __name__ == "__main__": + load_cleartext_ascii_armor_message() diff --git a/examples/load_credentials_file.py b/examples/load_credentials_file.py index 9942a1e9..70e6a49f 100644 --- a/examples/load_credentials_file.py +++ b/examples/load_credentials_file.py @@ -19,7 +19,7 @@ import sys from duniterpy.key import SigningKey -if __name__ == "__main__": +def load_credentials_file(): if len(sys.argv) < 2: print("Usage: python load_credentials_file.py FILEPATH") sys.exit(1) @@ -34,3 +34,7 @@ if __name__ == "__main__": # print pubkey print("Public key from credentials file: {}".format(signing_key_instance.pubkey)) + + +if __name__ == "__main__": + load_credentials_file() diff --git a/examples/load_encrypted_ascii_armor_message.py b/examples/load_encrypted_ascii_armor_message.py index 5e27efb1..44234bda 100644 --- a/examples/load_encrypted_ascii_armor_message.py +++ b/examples/load_encrypted_ascii_armor_message.py @@ -25,7 +25,7 @@ ENCRYPTED_AA_MESSAGE_PATH = "/tmp/duniter_aa_encrypted_message.txt" ################################################ -if __name__ == "__main__": +def load_encrypted_ascii_armor_message(): # Ask public key of the recipient pubkeyBase58 = input("Enter public key of the message issuer: ") @@ -49,3 +49,7 @@ if __name__ == "__main__": ) print(AsciiArmor.parse(ascii_armor_block, signing_key, [pubkeyBase58])) + + +if __name__ == "__main__": + load_encrypted_ascii_armor_message() diff --git a/examples/load_local_blockchain.py b/examples/load_local_blockchain.py index b5d727c4..517b6416 100644 --- a/examples/load_local_blockchain.py +++ b/examples/load_local_blockchain.py @@ -21,10 +21,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. from duniterpy.helpers.blockchain import load -bc = load() # gets blockchain iterator -b = next(bc) # gets block -print(f"first block number is: {b.number}") # should return 0 -# you can access all properties of this block through it's duniterpy objects attributes -print(f"second block number is: {next(bc).number}") # should return 1 -print(f"third block number is: {next(bc).number}") # should return 2 -# (and so on) +def load_local_blockchain(): + bc = load() # gets blockchain iterator + b = next(bc) # gets block + print(f"first block number is: {b.number}") # should return 0 + # you can access all properties of this block through it's duniterpy objects attributes + print(f"second block number is: {next(bc).number}") # should return 1 + print(f"third block number is: {next(bc).number}") # should return 2 + # (and so on) + +if __name__ == "__main__": + load_local_blockchain() diff --git a/examples/load_scuttlebutt_file.py b/examples/load_scuttlebutt_file.py index e5e557cc..48cff9a8 100644 --- a/examples/load_scuttlebutt_file.py +++ b/examples/load_scuttlebutt_file.py @@ -19,7 +19,7 @@ import sys from duniterpy.key import SigningKey -if __name__ == "__main__": +def load_scuttlebutt_file(): if len(sys.argv) < 2: print("Usage: python load_scuttlebutt_file.py FILEPATH") sys.exit(1) @@ -34,3 +34,7 @@ if __name__ == "__main__": # print pubkey print("Public key from scuttlebutt file: {}".format(signing_key_instance.pubkey)) + + +if __name__ == "__main__": + load_scuttlebutt_file() diff --git a/examples/request_available_nodes.py b/examples/request_available_nodes.py index e4a394bd..7b806d00 100644 --- a/examples/request_available_nodes.py +++ b/examples/request_available_nodes.py @@ -29,7 +29,7 @@ BMAS_ENDPOINT = "BMAS g1-test.duniter.org 443" ################################################ -def main(): +def request_available_nodes(): """ Main code """ @@ -49,4 +49,4 @@ def main(): if __name__ == "__main__": - main() + request_available_nodes() diff --git a/examples/request_data.py b/examples/request_data.py index f86b7a45..caea39bf 100644 --- a/examples/request_data.py +++ b/examples/request_data.py @@ -29,7 +29,7 @@ BMAS_ENDPOINT = "BMAS g1-test.duniter.org 443" ################################################ -def main(): +def request_data(): """ Main code (synchronous requests) """ @@ -80,4 +80,4 @@ def main(): if __name__ == "__main__": - main() + request_data() diff --git a/examples/request_data_async.py b/examples/request_data_async.py index 0939f039..1633ca1a 100644 --- a/examples/request_data_async.py +++ b/examples/request_data_async.py @@ -39,7 +39,7 @@ async def coroutine(function, *args, **kwargs): return function(*args, **kwargs) -async def main(): +async def request_data_async(): """ Main code (asynchronous requests) @@ -72,4 +72,5 @@ async def main(): # Latest duniter-python-api is asynchronous and you have to use asyncio, an asyncio loop and a "as" on the data. # ( https://docs.python.org/3/library/asyncio.html ) -asyncio.get_event_loop().run_until_complete(main()) +if __name__ == "__main__": + asyncio.get_event_loop().run_until_complete(request_data_async()) diff --git a/examples/request_data_elasticsearch.py b/examples/request_data_elasticsearch.py index 3e247d7a..543d8e8b 100644 --- a/examples/request_data_elasticsearch.py +++ b/examples/request_data_elasticsearch.py @@ -32,7 +32,7 @@ ES_USER_ENDPOINT = "ES_USER_API g1-test.data.duniter.fr 443" ################################################ -def main(): +def request_data_elasticsearch(): """ Main code (synchronous requests) """ @@ -64,4 +64,4 @@ def main(): if __name__ == "__main__": - main() + request_data_elasticsearch() diff --git a/examples/request_data_graphql.py b/examples/request_data_graphql.py index e9fa5f1f..5849bbf5 100644 --- a/examples/request_data_graphql.py +++ b/examples/request_data_graphql.py @@ -16,7 +16,7 @@ GVA_ENDPOINT = "GVA S g1.librelois.fr 443 gva" ################################################ -def main(): +def request_data_graphql(): client = Client(GVA_ENDPOINT) # get query to get schema from api @@ -56,4 +56,4 @@ def main(): if __name__ == "__main__": - main() + request_data_graphql() diff --git a/examples/request_web_socket_block.py b/examples/request_web_socket_block.py index d52aba94..16583c36 100644 --- a/examples/request_web_socket_block.py +++ b/examples/request_web_socket_block.py @@ -33,7 +33,7 @@ BMAS_ENDPOINT = "BMAS g1-test.duniter.org 443" ################################################ -def main(): +def request_web_socket_block(): """ Main code """ @@ -61,4 +61,4 @@ def main(): if __name__ == "__main__": - main() + request_web_socket_block() diff --git a/examples/request_ws2p.py b/examples/request_ws2p.py index 73c441b0..d224c3cf 100644 --- a/examples/request_ws2p.py +++ b/examples/request_ws2p.py @@ -79,7 +79,7 @@ def send(ws: WSConnection, request: str, request_id: str, schema: dict) -> Any: return response -def main(): +def request_ws2p(): """ Main code """ @@ -169,4 +169,4 @@ def main(): if __name__ == "__main__": - main() + request_ws2p() diff --git a/examples/save_and_load_private_key_file.py b/examples/save_and_load_private_key_file.py index 8e3c477f..d135f0e5 100644 --- a/examples/save_and_load_private_key_file.py +++ b/examples/save_and_load_private_key_file.py @@ -38,33 +38,35 @@ PRIVATE_KEYS_FILE_PATH = os.path.join(home_path, ".duniter_account_private_keys. ################################################ -# prompt hidden user entry -salt = getpass.getpass("Enter your passphrase (salt): ") +def save_and_load_private_key_file(): + # prompt hidden user entry + salt = getpass.getpass("Enter your passphrase (salt): ") -# prompt hidden user entry -password = getpass.getpass("Enter your password: ") + # prompt hidden user entry + password = getpass.getpass("Enter your password: ") -# prompt public key -pubkey = input("Enter your public key: ") + # prompt public key + pubkey = input("Enter your public key: ") -# init signer instance -signer = SigningKey.from_credentials(salt, password) + # init signer instance + signer = SigningKey.from_credentials(salt, password) -# check public key -if signer.pubkey != pubkey: - print("Bad credentials!") - sys.exit(1) + # check public key + if signer.pubkey != pubkey: + print("Bad credentials!") + sys.exit(1) -# save private keys in a file (json format) -signer.save_private_key(PRIVATE_KEYS_FILE_PATH) + # save private keys in a file (json format) + signer.save_private_key(PRIVATE_KEYS_FILE_PATH) -# document saved -print("Private keys for public key %s saved in %s" % (pubkey, PRIVATE_KEYS_FILE_PATH)) + # document saved + print("Private keys for public key %s saved in %s" % (pubkey, PRIVATE_KEYS_FILE_PATH)) -# load private keys from file -loaded_signer = SigningKey.from_private_key(PRIVATE_KEYS_FILE_PATH) # type: SigningKey + # load private keys from file + loaded_signer = SigningKey.from_private_key(PRIVATE_KEYS_FILE_PATH) # type: SigningKey -# check public key from file -print("Public key %s loaded from file %s" % (pubkey, PRIVATE_KEYS_FILE_PATH)) + # check public key from file + print("Public key %s loaded from file %s" % (loaded_signer.pubkey, PRIVATE_KEYS_FILE_PATH)) -sys.exit(0) +if __name__ == "__main__": + save_and_load_private_key_file() diff --git a/examples/save_and_load_private_key_file_ewif.py b/examples/save_and_load_private_key_file_ewif.py index 135ed202..009c9172 100644 --- a/examples/save_and_load_private_key_file_ewif.py +++ b/examples/save_and_load_private_key_file_ewif.py @@ -38,49 +38,50 @@ PRIVATE_KEY_FILE_PATH = os.path.join(home_path, ".duniter_account_ewif_v1.dunite ################################################ -# prompt hidden user entry -salt = getpass.getpass("Enter your passphrase (salt): ") +def save_and_load_private_key_file_ewif(): + # prompt hidden user entry + salt = getpass.getpass("Enter your passphrase (salt): ") -# prompt hidden user entry -password = getpass.getpass("Enter your password: ") + # prompt hidden user entry + password = getpass.getpass("Enter your password: ") -# prompt public key -pubkey = input("Enter your public key: ") + # prompt public key + pubkey = input("Enter your public key: ") -# init signer instance -signer = SigningKey.from_credentials(salt, password) + # init signer instance + signer = SigningKey.from_credentials(salt, password) -# check public key -if signer.pubkey != pubkey: - print("Bad credentials!") - sys.exit(1) + # check public key + if signer.pubkey != pubkey: + print("Bad credentials!") + sys.exit(1) -# prompt hidden user entry -ewif_password = getpass.getpass("Enter an encryption password: ") + # prompt hidden user entry + ewif_password = getpass.getpass("Enter an encryption password: ") -# save private key in a file (EWIF v1 format) -signer.save_ewif_file(PRIVATE_KEY_FILE_PATH, ewif_password) + # save private key in a file (EWIF v1 format) + signer.save_ewif_file(PRIVATE_KEY_FILE_PATH, ewif_password) -# document saved -print( - "Private key for public key %s saved in %s" % (signer.pubkey, PRIVATE_KEY_FILE_PATH) -) - -try: - # load private keys from file - loaded_signer = SigningKey.from_ewif_file( - PRIVATE_KEY_FILE_PATH, ewif_password - ) # type: SigningKey - - # check public key from file + # document saved print( - "Public key %s loaded from file %s" - % (loaded_signer.pubkey, PRIVATE_KEY_FILE_PATH) + "Private key for public key %s saved in %s" % (signer.pubkey, PRIVATE_KEY_FILE_PATH) ) -except IOError as error: - print(error) - sys.exit(1) + try: + # load private keys from file + loaded_signer = SigningKey.from_ewif_file( + PRIVATE_KEY_FILE_PATH, ewif_password + ) # type: SigningKey + + # check public key from file + print( + "Public key %s loaded from file %s" + % (loaded_signer.pubkey, PRIVATE_KEY_FILE_PATH) + ) + except IOError as error: + print(error) + sys.exit(1) -sys.exit(0) +if __name__ == "__main__": + save_and_load_private_key_file_ewif() diff --git a/examples/save_and_load_private_key_file_pubsec.py b/examples/save_and_load_private_key_file_pubsec.py index afe41a37..a42dd2ec 100644 --- a/examples/save_and_load_private_key_file_pubsec.py +++ b/examples/save_and_load_private_key_file_pubsec.py @@ -38,44 +38,46 @@ PRIVATE_KEY_FILE_PATH = os.path.join(home_path, ".duniter_account_pubsec_v1.duni ################################################ -# prompt hidden user entry -salt = getpass.getpass("Enter your passphrase (salt): ") -# prompt hidden user entry -password = getpass.getpass("Enter your password: ") +def save_and_load_private_key_file_pubsec(): + # prompt hidden user entry + salt = getpass.getpass("Enter your passphrase (salt): ") -# prompt public key -pubkey = input("Enter your public key: ") + # prompt hidden user entry + password = getpass.getpass("Enter your password: ") -# init signer instance -signer = SigningKey.from_credentials(salt, password) + # prompt public key + pubkey = input("Enter your public key: ") -# check public key -if signer.pubkey != pubkey: - print("Bad credentials!") - sys.exit(1) + # init signer instance + signer = SigningKey.from_credentials(salt, password) -# save private key in a file (PubSec v1 format) -signer.save_pubsec_file(PRIVATE_KEY_FILE_PATH) + # check public key + if signer.pubkey != pubkey: + print("Bad credentials!") + sys.exit(1) -# document saved -print( - "Private key for public key %s saved in %s" % (signer.pubkey, PRIVATE_KEY_FILE_PATH) -) + # save private key in a file (PubSec v1 format) + signer.save_pubsec_file(PRIVATE_KEY_FILE_PATH) -try: - # load private keys from file - loaded_signer = SigningKey.from_pubsec_file(PRIVATE_KEY_FILE_PATH) - - # check public key from file + # document saved print( - "Public key %s loaded from file %s" - % (loaded_signer.pubkey, PRIVATE_KEY_FILE_PATH) + "Private key for public key %s saved in %s" % (signer.pubkey, PRIVATE_KEY_FILE_PATH) ) -except IOError as error: - print(error) - sys.exit(1) + try: + # load private keys from file + loaded_signer = SigningKey.from_pubsec_file(PRIVATE_KEY_FILE_PATH) + + # check public key from file + print( + "Public key %s loaded from file %s" + % (loaded_signer.pubkey, PRIVATE_KEY_FILE_PATH) + ) + except IOError as error: + print(error) + sys.exit(1) -sys.exit(0) +if __name__ == "__main__": + save_and_load_private_key_file_pubsec() diff --git a/examples/save_and_load_private_key_file_wif.py b/examples/save_and_load_private_key_file_wif.py index fd78982d..aa9e479b 100644 --- a/examples/save_and_load_private_key_file_wif.py +++ b/examples/save_and_load_private_key_file_wif.py @@ -38,44 +38,45 @@ PRIVATE_KEY_FILE_PATH = os.path.join(home_path, ".duniter_account_wif_v1.duniter ################################################ -# prompt hidden user entry -salt = getpass.getpass("Enter your passphrase (salt): ") +def save_and_load_private_key_file_wif(): + # prompt hidden user entry + salt = getpass.getpass("Enter your passphrase (salt): ") -# prompt hidden user entry -password = getpass.getpass("Enter your password: ") + # prompt hidden user entry + password = getpass.getpass("Enter your password: ") -# prompt public key -pubkey = input("Enter your public key: ") + # prompt public key + pubkey = input("Enter your public key: ") -# init signer instance -signer = SigningKey.from_credentials(salt, password) + # init signer instance + signer = SigningKey.from_credentials(salt, password) -# check public key -if signer.pubkey != pubkey: - print("Bad credentials!") - sys.exit(1) + # check public key + if signer.pubkey != pubkey: + print("Bad credentials!") + sys.exit(1) -# save private key in a file (WIF v1 format) -signer.save_wif_file(PRIVATE_KEY_FILE_PATH) + # save private key in a file (WIF v1 format) + signer.save_wif_file(PRIVATE_KEY_FILE_PATH) -# document saved -print( - "Private key for public key %s saved in %s" % (signer.pubkey, PRIVATE_KEY_FILE_PATH) -) - -try: - # load private keys from file - loaded_signer = SigningKey.from_wif_file(PRIVATE_KEY_FILE_PATH) # type: SigningKey - - # check public key from file + # document saved print( - "Public key %s loaded from file %s" - % (loaded_signer.pubkey, PRIVATE_KEY_FILE_PATH) + "Private key for public key %s saved in %s" % (signer.pubkey, PRIVATE_KEY_FILE_PATH) ) -except IOError as error: - print(error) - sys.exit(1) + try: + # load private keys from file + loaded_signer = SigningKey.from_wif_file(PRIVATE_KEY_FILE_PATH) # type: SigningKey + + # check public key from file + print( + "Public key %s loaded from file %s" + % (loaded_signer.pubkey, PRIVATE_KEY_FILE_PATH) + ) + except IOError as error: + print(error) + sys.exit(1) -sys.exit(0) +if __name__ == "__main__": + save_and_load_private_key_file_wif() diff --git a/examples/save_binary_encrypted_message.py b/examples/save_binary_encrypted_message.py index 8000256e..38c88d15 100644 --- a/examples/save_binary_encrypted_message.py +++ b/examples/save_binary_encrypted_message.py @@ -23,7 +23,7 @@ ENCRYPTED_MESSAGE_FILENAME = "/tmp/duniter_encrypted_message.bin" ################################################ -if __name__ == "__main__": +def save_binary_encrypted_message(): # Ask public key of the recipient pubkeyBase58 = input("Enter public key of the message recipient: ") @@ -39,3 +39,6 @@ if __name__ == "__main__": file_handler.write(encrypted_message) print("Encrypted message saved in file ./{0}".format(ENCRYPTED_MESSAGE_FILENAME)) + +if __name__ == "__main__": + save_binary_encrypted_message() diff --git a/examples/save_binary_signed_message.py b/examples/save_binary_signed_message.py index 094d0861..0b6aef70 100644 --- a/examples/save_binary_signed_message.py +++ b/examples/save_binary_signed_message.py @@ -27,7 +27,7 @@ SIGNED_MESSAGE_FILENAME = "/tmp/duniter_signed_message.bin" ################################################ -if __name__ == "__main__": +def save_binary_signed_message(): # prompt hidden user entry salt = getpass.getpass("Enter your passphrase (salt): ") @@ -50,9 +50,14 @@ if __name__ == "__main__": veri = libnacl.sign.Verifier(key.hex_vk()) # Verify the message! verified = veri.verify(signed_message) + print(f"Message verified: {verified}") # save signed message in a file with open(SIGNED_MESSAGE_FILENAME, "wb") as file_handler: file_handler.write(signed_message) print("Signed message saved in file ./{0}".format(SIGNED_MESSAGE_FILENAME)) + + +if __name__ == "__main__": + save_binary_signed_message() diff --git a/examples/save_cleartext_ascii_armor_message.py b/examples/save_cleartext_ascii_armor_message.py index 2efb6c2d..6d26dfcb 100644 --- a/examples/save_cleartext_ascii_armor_message.py +++ b/examples/save_cleartext_ascii_armor_message.py @@ -28,7 +28,7 @@ CLEARTEXT_AA_MESSAGE_PATH = "/tmp/duniter_cleartext_aa_message.txt" ################################################ -if __name__ == "__main__": +def save_cleartext_ascii_armor_message(): # prompt hidden user entry salt = getpass.getpass("Enter your passphrase (salt): ") @@ -59,3 +59,6 @@ if __name__ == "__main__": CLEARTEXT_AA_MESSAGE_PATH ) ) + +if __name__ == "__main__": + save_cleartext_ascii_armor_message() diff --git a/examples/save_encrypted_ascii_armor_message.py b/examples/save_encrypted_ascii_armor_message.py index d5cc6a1b..c45cd44e 100644 --- a/examples/save_encrypted_ascii_armor_message.py +++ b/examples/save_encrypted_ascii_armor_message.py @@ -26,7 +26,7 @@ ENCRYPTED_AA_MESSAGE_PATH = "/tmp/duniter_aa_encrypted_message.txt" ################################################ -if __name__ == "__main__": +def save_encrypted_ascii_armor_message(): # Ask public key of the recipient pubkeyBase58 = input("Enter public key of the message recipient: ") @@ -63,3 +63,6 @@ if __name__ == "__main__": ENCRYPTED_AA_MESSAGE_PATH ) ) + +if __name__ == "__main__": + save_encrypted_ascii_armor_message() diff --git a/examples/save_revoke_document.py b/examples/save_revoke_document.py index 6bd3b9e8..dcbeed87 100644 --- a/examples/save_revoke_document.py +++ b/examples/save_revoke_document.py @@ -114,7 +114,7 @@ def get_signed_raw_revocation_document( return revocation.signed_raw() -def main(): +def save_revoke_document(): """ Main code """ @@ -167,4 +167,4 @@ def main(): if __name__ == "__main__": - main() + save_revoke_document() diff --git a/examples/send_certification.py b/examples/send_certification.py index 0d50c041..ba1b74f3 100644 --- a/examples/send_certification.py +++ b/examples/send_certification.py @@ -98,7 +98,7 @@ def get_certification_document( ) -def main(): +def send_certification(): """ Main code """ @@ -148,4 +148,4 @@ def main(): if __name__ == "__main__": - main() + send_certification() diff --git a/examples/send_identity.py b/examples/send_identity.py index b805e85b..2bdc9874 100644 --- a/examples/send_identity.py +++ b/examples/send_identity.py @@ -67,7 +67,7 @@ def get_identity_document( return identity -def main(): +def send_identity(): """ Main code """ @@ -105,4 +105,4 @@ def main(): if __name__ == "__main__": - main() + send_identity() diff --git a/examples/send_membership.py b/examples/send_membership.py index 649447b1..2506c9f4 100644 --- a/examples/send_membership.py +++ b/examples/send_membership.py @@ -74,7 +74,7 @@ def get_membership_document( return membership -def main(): +def send_membership(): """ Main code """ @@ -115,4 +115,4 @@ def main(): if __name__ == "__main__": - main() + send_membership() diff --git a/examples/send_transaction.py b/examples/send_transaction.py index f841adcd..cea1f0cd 100644 --- a/examples/send_transaction.py +++ b/examples/send_transaction.py @@ -105,7 +105,7 @@ def get_transaction_document( return transaction -def main(): +def send_transaction(): """ Main code """ @@ -160,4 +160,4 @@ def main(): if __name__ == "__main__": - main() + send_transaction() -- GitLab