From 43423a41eccea0c34a973b8b8e2adceaa2c2b957 Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Wed, 11 Jan 2017 20:31:20 +0100
Subject: [PATCH] Remove blockRot from parameters
---
src/sakia/data/entities/blockchain.py | 2 --
src/sakia/data/processors/blockchain.py | 1 -
src/sakia/gui/dialogs/connection_cfg/model.py | 2 +-
src/sakia/main.py | 2 +-
src/sakia/services/documents.py | 6 +++++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/sakia/data/entities/blockchain.py b/src/sakia/data/entities/blockchain.py
index 915551f2..4ff30d4f 100644
--- a/src/sakia/data/entities/blockchain.py
+++ b/src/sakia/data/entities/blockchain.py
@@ -36,8 +36,6 @@ class BlockchainParameters:
avg_gen_time = attr.ib(convert=int, default=0, cmp=False, hash=False)
# The number of blocks required to evaluate again PoWMin value
dt_diff_eval = attr.ib(convert=int, default=0, cmp=False, hash=False)
- # The number of previous blocks to check for personalized difficulty
- blocks_rot = attr.ib(convert=int, default=0, cmp=False, hash=False)
# The decimal percent of previous issuers to reach for personalized difficulty
percent_rot = attr.ib(convert=float, default=0, cmp=False, hash=False)
diff --git a/src/sakia/data/processors/blockchain.py b/src/sakia/data/processors/blockchain.py
index af0f8832..0332ff56 100644
--- a/src/sakia/data/processors/blockchain.py
+++ b/src/sakia/data/processors/blockchain.py
@@ -211,7 +211,6 @@ class BlockchainProcessor:
parameters = await self._bma_connector.get(currency, bma.blockchain.parameters)
blockchain.parameters.ms_validity = parameters['msValidity']
blockchain.parameters.avg_gen_time = parameters['avgGenTime']
- blockchain.parameters.blocks_rot = parameters['blocksRot']
blockchain.parameters.c = parameters['c']
blockchain.parameters.dt = parameters['dt']
blockchain.parameters.dt_diff_eval = parameters['dtDiffEval']
diff --git a/src/sakia/gui/dialogs/connection_cfg/model.py b/src/sakia/gui/dialogs/connection_cfg/model.py
index 145449ed..919b4972 100644
--- a/src/sakia/gui/dialogs/connection_cfg/model.py
+++ b/src/sakia/gui/dialogs/connection_cfg/model.py
@@ -169,7 +169,7 @@ class ConnectionConfigModel(QObject):
try:
data = await self.node_connector.safe_request(endpoint, bma.wot.lookup,
req_args={'search': search},
- proxy=self.user_parameters.proxy())
+ proxy=self.app.parameters.proxy())
if data:
registered = parser(data)
tries += 1
diff --git a/src/sakia/main.py b/src/sakia/main.py
index c5141cde..9fe924d9 100755
--- a/src/sakia/main.py
+++ b/src/sakia/main.py
@@ -92,7 +92,7 @@ if __name__ == '__main__':
with loop:
app = Application.startup(sys.argv, sakia, loop)
if not app.connection_exists():
- conn_controller = ConnectionConfigController.create(None, app)
+ conn_controller = ConnectionConfigController.create_connection(None, app)
loop.run_until_complete(conn_controller.async_exec())
window = MainWindowController.startup(app)
loop.run_forever()
diff --git a/src/sakia/services/documents.py b/src/sakia/services/documents.py
index c6acc1bb..347aa36f 100644
--- a/src/sakia/services/documents.py
+++ b/src/sakia/services/documents.py
@@ -121,7 +121,11 @@ class DocumentsService:
if isinstance(r, BaseException):
result = (False, str(r))
else:
- result = (False, (await r.json())["message"])
+ try:
+ result = (False, (await r.json())["message"])
+ except KeyError:
+ result = (False, await str(r.text()))
+
elif r.status == 200:
result = (True, (await r.json()))
else:
--
GitLab