diff --git a/src/sakia/data/entities/blockchain.py b/src/sakia/data/entities/blockchain.py index 915551f28b03f61650be709ed18cc80d0393a1c8..4ff30d4fefb3b5761b582e11cc4ac6f5b0ca033c 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 af0f8832167184ecfc932c21989fb110d91fcb20..0332ff561afe9c82de3ae5b7c433d69e5413934c 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 145449ed4ef9bfdd114acdc3db5e11a565d5e06f..919b49722f971044999220c16b720549ebdedc33 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 c5141cde6f6c84db617742fadf21e1f0b33c849c..9fe924d96acd4f5e07c14919ab32885e2731d194 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 c6acc1bb9d06c2c1ea17e13c227a5d07c7a55958..347aa36f9e6656f4e6ed31eb62e390789f1cdeba 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: