From 1c0732d983e29b47312fbb387421a9ef8034068a Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Sun, 7 Mar 2021 07:45:13 +0100
Subject: [PATCH] Upgrade notify

---
 .../{emulator/cli/config => .config_client}/app.ini         | 0
 .../{emulator/cli/config => .config_client}/client.ini      | 0
 .../{emulator/cli/config => .config_client}/ussd.ini        | 0
 .../{emulator/cli/cli.py => cic_ussd/runnable/client.py}    | 6 +++++-
 apps/cic-ussd/cic_ussd/version.py                           | 2 +-
 apps/cic-ussd/requirements.txt                              | 4 ++--
 apps/cic-ussd/setup.cfg                                     | 3 ++-
 apps/contract-migration/scripts/import_meta.js              | 2 +-
 8 files changed, 11 insertions(+), 6 deletions(-)
 rename apps/cic-ussd/{emulator/cli/config => .config_client}/app.ini (100%)
 rename apps/cic-ussd/{emulator/cli/config => .config_client}/client.ini (100%)
 rename apps/cic-ussd/{emulator/cli/config => .config_client}/ussd.ini (100%)
 rename apps/cic-ussd/{emulator/cli/cli.py => cic_ussd/runnable/client.py} (99%)

diff --git a/apps/cic-ussd/emulator/cli/config/app.ini b/apps/cic-ussd/.config_client/app.ini
similarity index 100%
rename from apps/cic-ussd/emulator/cli/config/app.ini
rename to apps/cic-ussd/.config_client/app.ini
diff --git a/apps/cic-ussd/emulator/cli/config/client.ini b/apps/cic-ussd/.config_client/client.ini
similarity index 100%
rename from apps/cic-ussd/emulator/cli/config/client.ini
rename to apps/cic-ussd/.config_client/client.ini
diff --git a/apps/cic-ussd/emulator/cli/config/ussd.ini b/apps/cic-ussd/.config_client/ussd.ini
similarity index 100%
rename from apps/cic-ussd/emulator/cli/config/ussd.ini
rename to apps/cic-ussd/.config_client/ussd.ini
diff --git a/apps/cic-ussd/emulator/cli/cli.py b/apps/cic-ussd/cic_ussd/runnable/client.py
similarity index 99%
rename from apps/cic-ussd/emulator/cli/cli.py
rename to apps/cic-ussd/cic_ussd/runnable/client.py
index bf280756..3278a9e9 100644
--- a/apps/cic-ussd/emulator/cli/cli.py
+++ b/apps/cic-ussd/cic_ussd/runnable/client.py
@@ -64,7 +64,7 @@ else:
     ssl = True
 
 
-if __name__ == "__main__":
+def main():
 
     # TODO: improve url building 
     url = 'http'
@@ -101,3 +101,7 @@ if __name__ == "__main__":
         state = response_data[:3]
         out = response_data[4:]
         print(out)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/apps/cic-ussd/cic_ussd/version.py b/apps/cic-ussd/cic_ussd/version.py
index 17432524..866d952b 100644
--- a/apps/cic-ussd/cic_ussd/version.py
+++ b/apps/cic-ussd/cic_ussd/version.py
@@ -1,7 +1,7 @@
 # standard imports
 import semver
 
-version = (0, 3, 0, 'alpha.1')
+version = (0, 3, 0, 'alpha.2')
 
 version_object = semver.VersionInfo(
         major=version[0],
diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt
index 85ffea91..f451f650 100644
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -8,10 +8,10 @@ celery==4.4.7
 cffi==1.14.3
 chainlib~=0.0.1a15
 cic-eth==0.10.0a39
-cic-notify==0.3.1
+cic-notify~=0.4.0a2
 cic-types==0.1.0a8
 click==7.1.2
-confini==0.3.5
+confini~=0.3.6rc3
 cryptography==3.2.1
 faker==4.17.1
 iniconfig==1.1.1
diff --git a/apps/cic-ussd/setup.cfg b/apps/cic-ussd/setup.cfg
index 620483a0..716e595d 100644
--- a/apps/cic-ussd/setup.cfg
+++ b/apps/cic-ussd/setup.cfg
@@ -44,4 +44,5 @@ scripts =
 
 [options.entry_points]
 console_scripts =
-	cic-ussd-tasker = cic_ussd.runnable.tasker:main
\ No newline at end of file
+	cic-ussd-tasker = cic_ussd.runnable.tasker:main
+	cic-ussd-client = cic_ussd.runnable.client:main
diff --git a/apps/contract-migration/scripts/import_meta.js b/apps/contract-migration/scripts/import_meta.js
index 3ea82e95..56c754f3 100644
--- a/apps/contract-migration/scripts/import_meta.js
+++ b/apps/contract-migration/scripts/import_meta.js
@@ -74,7 +74,7 @@ new cic.PGPKeyStore(
 	importMeta,
 );
 
-const batchSize = 50;
+const batchSize = 16;
 const batchDelay = 1000;
 const total = parseInt(process.argv[3]);
 const workDir = path.join(process.argv[2], 'meta');