From ed5896270fa22df597783c0ca4a956c7c66ba663 Mon Sep 17 00:00:00 2001
From: holgern <holgernahrstaedt@gmx.de>
Date: Sun, 22 Mar 2020 22:36:27 +0100
Subject: [PATCH] Fix tests
* fix EllipticCurvePublicNumbers
* Fix empty block return
---
beem/block.py | 6 +++++-
beemgraphenebase/ecdsasig.py | 2 +-
tests/beem/test_blockchain.py | 1 -
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/beem/block.py b/beem/block.py
index f61ab35f..cbea8883 100644
--- a/beem/block.py
+++ b/beem/block.py
@@ -131,7 +131,11 @@ class Block(BlockchainObject):
if self.only_ops or self.only_virtual_ops:
if self.steem.rpc.get_use_appbase():
try:
- ops = self.steem.rpc.get_ops_in_block({"block_num": self.identifier, 'only_virtual': self.only_virtual_ops}, api="account_history")["ops"]
+ ops_ops = self.steem.rpc.get_ops_in_block({"block_num": self.identifier, 'only_virtual': self.only_virtual_ops}, api="account_history")
+ if ops_ops is None:
+ ops = None
+ else:
+ ops = ops["ops"]
except ApiNotSupported:
ops = self.steem.rpc.get_ops_in_block(self.identifier, self.only_virtual_ops, api="condenser")
else:
diff --git a/beemgraphenebase/ecdsasig.py b/beemgraphenebase/ecdsasig.py
index b9e3dd0d..ca74ffa2 100644
--- a/beemgraphenebase/ecdsasig.py
+++ b/beemgraphenebase/ecdsasig.py
@@ -104,7 +104,7 @@ def recover_public_key(digest, signature, i, message=None):
message = py23_bytes(message, "utf-8")
sigder = encode_dss_signature(r, s)
try:
- public_key = ec.EllipticCurvePublicNumbers(Q.__x, Q.__y, ec.SECP256K1()).public_key(default_backend())
+ public_key = ec.EllipticCurvePublicNumbers(Q.x(), Q.y(), ec.SECP256K1()).public_key(default_backend())
except:
public_key = ec.EllipticCurvePublicNumbers(Q._Point__x, Q._Point__y, ec.SECP256K1()).public_key(default_backend())
public_key.verify(sigder, message, ec.ECDSA(hashes.SHA256()))
diff --git a/tests/beem/test_blockchain.py b/tests/beem/test_blockchain.py
index ddf0b29d..4345f206 100644
--- a/tests/beem/test_blockchain.py
+++ b/tests/beem/test_blockchain.py
@@ -18,7 +18,6 @@ from beem.nodelist import NodeList
from beembase.signedtransactions import Signed_Transaction
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
-nodes_appbase = ["https://api.steemitstage.com", "https://api.steem.house", "https://api.steemit.com"]
class Testcases(unittest.TestCase):
--
GitLab