Skip to content
Snippets Groups Projects
Commit cba84249 authored by Holger Nahrstaedt's avatar Holger Nahrstaedt
Browse files

Prepare next version 0.9.10

parent 427d1e55
No related branches found
No related tags found
No related merge requests found
...@@ -117,6 +117,10 @@ Documentation is available at http://beem.readthedocs.io/en/latest/ ...@@ -117,6 +117,10 @@ Documentation is available at http://beem.readthedocs.io/en/latest/
Changelog Changelog
========= =========
0.19.10
-------
* Memo encryption/decryption fixed
0.19.9 0.19.9
------ ------
* CLI tool improved * CLI tool improved
......
...@@ -200,7 +200,8 @@ class Wallet(object): ...@@ -200,7 +200,8 @@ class Wallet(object):
def changePassphrase(self, new_pwd): def changePassphrase(self, new_pwd):
""" Change the passphrase for the wallet database """ Change the passphrase for the wallet database
""" """
assert not self.locked() if self.locked():
raise AssertionError()
self.masterpwd.changePassword(new_pwd) self.masterpwd.changePassword(new_pwd)
def created(self): def created(self):
...@@ -247,7 +248,8 @@ class Wallet(object): ...@@ -247,7 +248,8 @@ class Wallet(object):
def encrypt_wif(self, wif): def encrypt_wif(self, wif):
""" Encrypt a wif key """ Encrypt a wif key
""" """
assert not self.locked() if self.locked():
raise AssertionError()
return format( return format(
bip38.encrypt(PrivateKey(wif, prefix=self.prefix), self.masterpassword), "encwif") bip38.encrypt(PrivateKey(wif, prefix=self.prefix), self.masterpassword), "encwif")
...@@ -260,7 +262,8 @@ class Wallet(object): ...@@ -260,7 +262,8 @@ class Wallet(object):
return encwif return encwif
except: except:
pass pass
assert not self.locked() if self.locked():
raise AssertionError()
return format(bip38.decrypt(encwif, self.masterpassword), "wif") return format(bip38.decrypt(encwif, self.masterpassword), "wif")
def addPrivateKey(self, wif): def addPrivateKey(self, wif):
......
...@@ -92,8 +92,10 @@ class Witness(BlockchainObject): ...@@ -92,8 +92,10 @@ class Witness(BlockchainObject):
else: else:
quote = Amount(quote, "STEEM", steem_instance=self.steem) quote = Amount(quote, "STEEM", steem_instance=self.steem)
assert base.symbol == "SBD" if not base.symbol == "SBD":
assert quote.symbol == "STEEM" raise AssertionError()
if not quote.symbol == "STEEM":
raise AssertionError()
op = operations.Feed_publish( op = operations.Feed_publish(
**{ **{
......
...@@ -150,8 +150,8 @@ class Account_create(GrapheneObject): ...@@ -150,8 +150,8 @@ class Account_create(GrapheneObject):
kwargs = args[0] kwargs = args[0]
prefix = kwargs.get("prefix", default_prefix) prefix = kwargs.get("prefix", default_prefix)
assert len(kwargs["new_account_name"] if not len(kwargs["new_account_name"]) <= 16:
) <= 16, "Account name must be at most 16 chars long" raise AssertionError("Account name must be at most 16 chars long")
meta = "" meta = ""
if "json_metadata" in kwargs and kwargs["json_metadata"]: if "json_metadata" in kwargs and kwargs["json_metadata"]:
...@@ -183,8 +183,8 @@ class Account_create_with_delegation(GrapheneObject): ...@@ -183,8 +183,8 @@ class Account_create_with_delegation(GrapheneObject):
kwargs = args[0] kwargs = args[0]
prefix = kwargs.get("prefix", default_prefix) prefix = kwargs.get("prefix", default_prefix)
assert len(kwargs["new_account_name"] if not len(kwargs["new_account_name"]) <= 16:
) <= 16, "Account name must be at most 16 chars long" raise AssertionError("Account name must be at most 16 chars long")
meta = "" meta = ""
if "json_metadata" in kwargs and kwargs["json_metadata"]: if "json_metadata" in kwargs and kwargs["json_metadata"]:
......
...@@ -34,7 +34,8 @@ commands = ...@@ -34,7 +34,8 @@ commands =
[testenv:coverage] [testenv:coverage]
deps = coverage deps = coverage
commands = 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] [testenv:upload_coverage]
deps = coverage deps = coverage
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment