From 78d7406ceac58f033462d1360f8557bccc427b4f Mon Sep 17 00:00:00 2001 From: inso <insomniak.fr@gmaiL.com> Date: Sat, 14 Jan 2017 18:57:24 +0100 Subject: [PATCH] Do not commit connector and connection synchron --- src/sakia/gui/dialogs/connection_cfg/controller.py | 1 + src/sakia/gui/dialogs/connection_cfg/model.py | 4 +++- tests/functional/test_connection_cfg_dialog.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sakia/gui/dialogs/connection_cfg/controller.py b/src/sakia/gui/dialogs/connection_cfg/controller.py index 3263985f..148e6ca9 100644 --- a/src/sakia/gui/dialogs/connection_cfg/controller.py +++ b/src/sakia/gui/dialogs/connection_cfg/controller.py @@ -155,6 +155,7 @@ class ConnectionConfigController(QObject): self.view.stacked_pages.setCurrentWidget(self.view.page_connection) connection_identity = await self.step_key + self.model.insert_or_update_connector() self.view.stacked_pages.setCurrentWidget(self.view.page_services) self.view.progress_bar.setValue(0) self.view.progress_bar.setMaximum(3) diff --git a/src/sakia/gui/dialogs/connection_cfg/model.py b/src/sakia/gui/dialogs/connection_cfg/model.py index c1a7c3b9..a2fd6d53 100644 --- a/src/sakia/gui/dialogs/connection_cfg/model.py +++ b/src/sakia/gui/dialogs/connection_cfg/model.py @@ -54,9 +54,11 @@ Current database is storing {1} network.""".format(node_connector.node.currency, self.connection.password = password self.connection.pubkey = SigningKey(self.connection.salt, password, scrypt_params).pubkey + def insert_or_update_connector(self): + NodesProcessor(self.app.db.nodes_repo).commit_node(self.node_connector.node) + def insert_or_update_connection(self): ConnectionsProcessor(self.app.db.connections_repo).commit_connection(self.connection) - NodesProcessor(self.app.db.nodes_repo).commit_node(self.node_connector.node) def insert_or_update_identity(self, identity): self.identities_processor.insert_or_update_identity(identity) diff --git a/tests/functional/test_connection_cfg_dialog.py b/tests/functional/test_connection_cfg_dialog.py index fb831912..f9f50c56 100644 --- a/tests/functional/test_connection_cfg_dialog.py +++ b/tests/functional/test_connection_cfg_dialog.py @@ -46,7 +46,7 @@ async def test_register_empty_blockchain(application, fake_server, bob): assert_key_parameters_behaviour(connection_config_dialog, bob) QTest.mouseClick(connection_config_dialog.view.button_next, Qt.LeftButton) connection_config_dialog.model.connection.password = bob.password - await asyncio.sleep(1) + await asyncio.sleep(10) assert connection_config_dialog.view.stacked_pages.currentWidget() == connection_config_dialog.view.page_services assert len(ConnectionsProcessor.instanciate(application).connections(fake_server.forge.currency)) == 1 -- GitLab