Skip to content
Snippets Groups Projects
Commit 6ffe13ab authored by inso's avatar inso
Browse files

Fix pubkey matching

parent 76f15863
No related branches found
No related tags found
No related merge requests found
import asyncio
import re
import logging
from PyQt5.QtCore import Qt, QObject, pyqtSignal
from PyQt5.QtWidgets import QApplication, QDialog, QVBoxLayout
from duniterpy.documents.crc_pubkey import CRCPubkey
from duniterpy.documents.constants import pubkey_regex
from duniterpy.documents import CRCPubkey
from sakia.data.processors import ConnectionsProcessor
from sakia.decorators import asyncify
from sakia.gui.sub.password_input import PasswordInputController
......@@ -156,7 +157,7 @@ class TransferController(QObject):
try:
crc_pubkey = CRCPubkey.from_str(self.view.pubkey_value())
return crc_pubkey.is_valid()
except ValueError:
except AttributeError:
return False
else:
return False
......@@ -183,8 +184,10 @@ class TransferController(QObject):
crc_pubkey = CRCPubkey.from_str(self.view.pubkey_value())
if crc_pubkey.is_valid():
pubkey = crc_pubkey.pubkey
except ValueError:
pubkey = self.view.pubkey_value()
except AttributeError:
result = re.compile("^({0})$".format(pubkey_regex)).match(self.view.pubkey_value())
if result:
pubkey = self.view.pubkey_value()
return pubkey
@asyncify
......
......@@ -32,5 +32,5 @@ async def test_transfer(application_with_one_connection, fake_server_with_blockc
application_with_one_connection.loop.call_later(10, close_dialog)
transfer_dialog.view.show()
await exec_test()
close_dialog()
await fake_server_with_blockchain.close()
#close_dialog()
#await fake_server_with_blockchain.close()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment