From cba842494a741784e85638147cac17ad9027fd9f Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holger@nahrstaedt.de>
Date: Fri, 2 Mar 2018 22:57:58 +0100
Subject: [PATCH] Prepare next version 0.9.10
---
README.rst | 4 ++++
beem/wallet.py | 9 ++++++---
beem/witness.py | 6 ++++--
beembase/operations.py | 8 ++++----
tox.ini | 3 ++-
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/README.rst b/README.rst
index 2341fb0a..e79adffb 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 9618d2b6..f4dbda02 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 42e86ca3..a9ee4901 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 eb60d58c..6c0375e8 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 4160dff8..071a2ea8 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
--
GitLab