diff --git a/README.rst b/README.rst index 2341fb0aa7d50560eb8eaaebd1828371457850f0..e79adffbeb1a0a038a434a1530f39ac84c553599 100644 --- a/README.rst +++ b/README.rst @@ -117,6 +117,10 @@ Documentation is available at http://beem.readthedocs.io/en/latest/ Changelog ========= +0.19.10 +------- +* Memo encryption/decryption fixed + 0.19.9 ------ * CLI tool improved diff --git a/beem/wallet.py b/beem/wallet.py index 9618d2b6644820d4fe460e8a09ccd66057f82a10..f4dbda02547a9488f8889b2a75e75bcefa8c9632 100644 --- a/beem/wallet.py +++ b/beem/wallet.py @@ -200,7 +200,8 @@ class Wallet(object): def changePassphrase(self, new_pwd): """ Change the passphrase for the wallet database """ - assert not self.locked() + if self.locked(): + raise AssertionError() self.masterpwd.changePassword(new_pwd) def created(self): @@ -247,7 +248,8 @@ class Wallet(object): def encrypt_wif(self, wif): """ Encrypt a wif key """ - assert not self.locked() + if self.locked(): + raise AssertionError() return format( bip38.encrypt(PrivateKey(wif, prefix=self.prefix), self.masterpassword), "encwif") @@ -260,7 +262,8 @@ class Wallet(object): return encwif except: pass - assert not self.locked() + if self.locked(): + raise AssertionError() return format(bip38.decrypt(encwif, self.masterpassword), "wif") def addPrivateKey(self, wif): diff --git a/beem/witness.py b/beem/witness.py index 42e86ca3fe33831c8c50f0bba1bcd8f7f4083fb3..a9ee4901b52121ea7994bde9a192fe157ef14160 100644 --- a/beem/witness.py +++ b/beem/witness.py @@ -92,8 +92,10 @@ class Witness(BlockchainObject): else: quote = Amount(quote, "STEEM", steem_instance=self.steem) - assert base.symbol == "SBD" - assert quote.symbol == "STEEM" + if not base.symbol == "SBD": + raise AssertionError() + if not quote.symbol == "STEEM": + raise AssertionError() op = operations.Feed_publish( **{ diff --git a/beembase/operations.py b/beembase/operations.py index eb60d58c6611b8549573da02b4affa9830af6d6a..6c0375e8d2b1a17a24671cf7a03cb000a6b4395f 100644 --- a/beembase/operations.py +++ b/beembase/operations.py @@ -150,8 +150,8 @@ class Account_create(GrapheneObject): kwargs = args[0] prefix = kwargs.get("prefix", default_prefix) - assert len(kwargs["new_account_name"] - ) <= 16, "Account name must be at most 16 chars long" + if not len(kwargs["new_account_name"]) <= 16: + raise AssertionError("Account name must be at most 16 chars long") meta = "" if "json_metadata" in kwargs and kwargs["json_metadata"]: @@ -183,8 +183,8 @@ class Account_create_with_delegation(GrapheneObject): kwargs = args[0] prefix = kwargs.get("prefix", default_prefix) - assert len(kwargs["new_account_name"] - ) <= 16, "Account name must be at most 16 chars long" + if not len(kwargs["new_account_name"]) <= 16: + raise AssertionError("Account name must be at most 16 chars long") meta = "" if "json_metadata" in kwargs and kwargs["json_metadata"]: diff --git a/tox.ini b/tox.ini index 4160dff88c1277c44a29c6a9a61d8ca89fa615bd..071a2ea85614eeb04c68c3ca611b29d77ec13398 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,8 @@ commands = [testenv:coverage] deps = coverage commands = - py.test --cov-report xml:/home/circleci/repo/.tox/upload_coverage/coverage.xml + {envpython} -m coverage run -s tests + {envpython} -m coverage xml [testenv:upload_coverage] deps = coverage