funga

commit 71c87d9e37ff4359300527b98011322c67e2bfc2
parent b553341a301249f5c26141b06c7482d95547fc6b
Author: Louis Holbrook <accounts-gitlab@holbrook.no>
Date:   Sat, 19 Sep 2020 12:26:34 +0000

Merge branch 'lash/table-when-not-exist' into 'master'

Only create table if not exist

See merge request nolash/crypto-dev-signer!1
Diffstat:
M
CHANGELOG
 | 
2
++
M
crypto_dev_signer/keystore/postgres.py
 | 
4
++--
M
scripts/crypto-dev-daemon
 | 
2
+-
M
setup.py
 | 
2
+-

4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+* 0.1.1
+	- Create key table only if not exist
 * 0.1.0
 	- Package wrap with setup.py
 	- Fix hex prefix bug in tx serialization
diff --git a/crypto_dev_signer/keystore/postgres.py b/crypto_dev_signer/keystore/postgres.py
@@ -28,13 +28,13 @@ def to_bytes(x):
 class ReferenceKeystore(Keystore):
 
         schema = [
-    """CREATE TABLE ethereum (
+    """CREATE TABLE IF NOT EXISTS ethereum (
         id SERIAL NOT NULL PRIMARY KEY,
         key_ciphertext VARCHAR(256) NOT NULL,
         wallet_address_hex CHAR(40) NOT NULL
         );
 """,
-    """CREATE UNIQUE INDEX ethereum_address_idx ON ethereum ( wallet_address_hex );
+    """CREATE UNIQUE INDEX IF NOT EXISTS ethereum_address_idx ON ethereum ( wallet_address_hex );
 """,
     ]
 
diff --git a/scripts/crypto-dev-daemon b/scripts/crypto-dev-daemon
@@ -152,7 +152,7 @@ def init():
     kw = {
             'symmetric_key': secret,
             }
-    db = ReferenceKeystore('cic_signer', **kw)
+    db = ReferenceKeystore(os.environ.get('SIGNER_DATABASE', 'cic_signer'), **kw)
     signer = ReferenceSigner(db)
 
 
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
         name="crypto-dev-signer",
-        version="0.1.0",
+        version="0.1.1",
         description="A signer and keystore daemon and library for cryptocurrency software development",
         author="Louis Holbrook",
         author_email="dev@holbrook.no",