From befcb0e0fb59da32d95e8a9add49b7923e9ba064 Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 26 May 2021 09:07:03 +0200 Subject: [PATCH] Remove bogus logging --- .../cic_ussd/runnable/daemons/cic_user_ussd_server.py | 9 ++------- apps/data-seeding/README.md | 6 ++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py index 6a7485e9..9ae0466f 100644 --- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py +++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py @@ -31,17 +31,13 @@ from cic_ussd.processor import get_default_token_data from cic_ussd.redis import cache_data, create_cached_data_key, InMemoryStore from cic_ussd.requests import (get_request_endpoint, get_request_method) -#from cic_ussd.runnable.server_base import exportable_parser, logg -from cic_ussd.runnable.server_base import exportable_parser +from cic_ussd.runnable.server_base import exportable_parser, logg from cic_ussd.session.ussd_session import UssdSession as InMemoryUssdSession from cic_ussd.state_machine import UssdStateMachine from cic_ussd.validator import check_ip, check_request_content_length, validate_phone_number, validate_presence args = exportable_parser.parse_args() -logging.basicConfig(level=logging.WARNING) -logg = logging.getLogger() - # define log levels if args.vv: logging.getLogger().setLevel(logging.DEBUG) @@ -143,12 +139,11 @@ def application(env, start_response): # define headers errors_headers = [('Content-Type', 'text/plain'), ('Content-Length', '0')] headers = [('Content-Type', 'text/plain')] - logg.debug('foo {}'.format(headers)) if get_request_method(env=env) == 'POST' and get_request_endpoint(env=env) == '/': if env.get('CONTENT_TYPE') != 'application/x-www-form-urlencoded': - start_response('405 Play by the rules', errors_headers) + start_response('405 Urlencoded, please', errors_headers) return [] post_data = env.get('wsgi.input').read() diff --git a/apps/data-seeding/README.md b/apps/data-seeding/README.md index 3583eed1..f894ae98 100644 --- a/apps/data-seeding/README.md +++ b/apps/data-seeding/README.md @@ -128,6 +128,8 @@ The keystore file used for transferring external opening balances tracker is rel All external balance transactions are saved in raw wire format in `/txs`, with transaction hash as file name. +If the contract migrations have been executed with the default "giftable" token contract, then the `token_symbol` in the `import_balance` scripts should be set to `GFT`. + #### Alternative 1 - Sovereign wallet import - `eth` @@ -143,7 +145,7 @@ After the script completes, keystore files for all generated accouts will be fou Then run: -`python eth/import_balance.py -v -c config -r -p --offset -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c ` +`python eth/import_balance.py -v -c config -r -p --token-symbol --offset -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c ` @@ -151,7 +153,7 @@ Then run: Run in sequence, in first terminal: -`python cic_eth/import_balance.py -v -c config -p -r -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out` +`python cic_eth/import_balance.py -v -c config -p -r --token-symbol -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out` In another terminal: