diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py index a7dafaece39dadceb3ca5baeec9a68c9120832dc..a0802e380d1b78ff239f49eb28362e633b023638 100644 --- a/src/cutecoin/core/account.py +++ b/src/cutecoin/core/account.py @@ -442,7 +442,7 @@ class Account(QObject): logging.debug("Send membership") blockid = yield from community.blockid() - self_identity = yield from self._identities_registry.future_lookup(self.pubkey, community) + self_identity = yield from self._identities_registry.future_find(self.pubkey, community) selfcert = yield from self_identity.selfcert(community) membership = Membership(PROTOCOL_VERSION, community.currency, @@ -495,7 +495,7 @@ class Account(QObject): """ logging.debug("Certdata") blockid = yield from community.blockid() - identity = yield from self._identities_registry.future_lookup(pubkey, community) + identity = yield from self._identities_registry.future_find(pubkey, community) selfcert = yield from identity.selfcert(community) certification = Certification(PROTOCOL_VERSION, community.currency, self.pubkey, pubkey, @@ -549,7 +549,7 @@ class Account(QObject): :param str password: The account SigningKey password :param cutecoin.core.community.Community community: The community target of the revocation """ - revoked = yield from self._identities_registry.future_lookup(self.pubkey, community) + revoked = yield from self._identities_registry.future_find(self.pubkey, community) revocation = Revocation(PROTOCOL_VERSION, community.currency, None) selfcert = revoked.selfcert(community) diff --git a/src/cutecoin/core/net/api/bma/__init__.py b/src/cutecoin/core/net/api/bma/__init__.py index 12e54f5c38647639a8560a0ec1aa5279cb743713..00af271a8ce89d969998265520ea61ba72879fae 100644 --- a/src/cutecoin/core/net/api/bma/__init__.py +++ b/src/cutecoin/core/net/api/bma/__init__.py @@ -13,10 +13,10 @@ PROTOCOL_VERSION = "1" @asyncio.coroutine def timeout(reply, seconds): - logging.debug("Sleep timeout...") + #logging.debug("Sleep timeout...") yield from asyncio.sleep(seconds) if reply.isRunning(): - logging.debug("Reply aborted because of timeout") + #logging.debug("Reply aborted because of timeout") reply.abort() diff --git a/src/cutecoin/core/registry/identities.py b/src/cutecoin/core/registry/identities.py index 12eb705abfe0dd503a27b2463e1dd262977620d2..42ab285587d14ba556b728475f121f7638730a92 100644 --- a/src/cutecoin/core/registry/identities.py +++ b/src/cutecoin/core/registry/identities.py @@ -87,7 +87,7 @@ class IdentitiesRegistry: reply = community.bma_access.simple_request(qtbma.wot.CertifiersOf, req_args={'search': pubkey}) reply.finished.connect(lambda: handle_certifiersof_reply(reply, tries=tries+1)) else: - future_identity.set_result(False) + future_identity.set_result(True) def handle_lookup_reply(reply, tries=0): status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) @@ -114,7 +114,7 @@ class IdentitiesRegistry: reply = community.bma_access.simple_request(qtbma.wot.Lookup, req_args={'search': pubkey}) reply.finished.connect(lambda: handle_lookup_reply(reply, tries=tries+1)) else: - future_identity.set_result(False) + future_identity.set_result(True) future_identity = asyncio.Future() if pubkey in self._instances: diff --git a/src/cutecoin/core/txhistory.py b/src/cutecoin/core/txhistory.py index 4824f325414995c54ef0e665a72f2da34088597c..5f434d62626d8def3d5ed2e8ab0babff58f47120 100644 --- a/src/cutecoin/core/txhistory.py +++ b/src/cutecoin/core/txhistory.py @@ -85,13 +85,13 @@ class TxHistory(): receivers = [txdata['issuers'][0]] try: - issuer = yield from self.wallet._identities_registry.future_lookup(txdata['issuers'][0], community) + issuer = yield from self.wallet._identities_registry.future_find(txdata['issuers'][0], community) issuer_uid = issuer.uid except LookupFailureError: issuer_uid = "" try: - receiver = yield from self.wallet._identities_registry.future_lookup(receivers[0], community) + receiver = yield from self.wallet._identities_registry.future_find(receivers[0], community) receiver_uid = receiver.uid except LookupFailureError: receiver_uid = "" diff --git a/src/cutecoin/core/wallet.py b/src/cutecoin/core/wallet.py index 751d9099bfc62fb35a6690caee515722ab12acb9..25cdba27f1accdbc08d2ee115d6ac9929afb990e 100644 --- a/src/cutecoin/core/wallet.py +++ b/src/cutecoin/core/wallet.py @@ -247,13 +247,13 @@ class Wallet(QObject): logging.debug("Sender pubkey:{0}".format(key.pubkey)) try: - issuer = yield from self._identities_registry.future_lookup(key.pubkey, community) + issuer = yield from self._identities_registry.future_find(key.pubkey, community) issuer_uid = issuer.uid except LookupFailureError as e: issuer_uid = "" try: - receiver = yield from self._identities_registry.future_lookup(recipient, community) + receiver = yield from self._identities_registry.future_find(recipient, community) receiver_uid = receiver.uid except LookupFailureError as e: receiver_uid = "" diff --git a/src/cutecoin/gui/community_tab.py b/src/cutecoin/gui/community_tab.py index 38caf2856b55550ad36694514ccf8fb7328c3073..6c11dc6e8dc9ba4c8de9c2af5926cfcdf23bf935 100644 --- a/src/cutecoin/gui/community_tab.py +++ b/src/cutecoin/gui/community_tab.py @@ -189,7 +189,7 @@ class CommunityTabWidget(QWidget, Ui_CommunityTabWidget): response = yield from self.community.bma_access.future_request(qtbma.wot.Lookup, {'search': text}) identities = [] for identity_data in response['results']: - identity = yield from self.app.identities_registry.future_lookup(identity_data['pubkey'], self.community) + identity = yield from self.app.identities_registry.future_find(identity_data['pubkey'], self.community) identities.append(identity) self_identity = self.account.identity(self.community) diff --git a/src/cutecoin/gui/process_cfg_community.py b/src/cutecoin/gui/process_cfg_community.py index 993b6e57eeffc5d5871b76ec6ec35d02052840cb..9f37d5eda232bfe842704ceb75f6f24938f4678d 100644 --- a/src/cutecoin/gui/process_cfg_community.py +++ b/src/cutecoin/gui/process_cfg_community.py @@ -225,7 +225,7 @@ class ProcessConfigureCommunity(QDialog, Ui_CommunityConfigurationDialog): @asyncio.coroutine def final(self): - identity = yield from self.app.identities_registry.future_lookup(self.account.pubkey, self.community) + identity = yield from self.app.identities_registry.future_find(self.account.pubkey, self.community) if identity.status == Identity.NOT_FOUND: reply = QMessageBox.question(self, self.tr("Pubkey not found"), self.tr("""The public key of your account wasn't found in the community. :\n diff --git a/src/cutecoin/tests/stubs/core/registry/identities.py b/src/cutecoin/tests/stubs/core/registry/identities.py index e06ecb447f7cd9574c109773994a81b4ca0b2fd0..7cebf6522df4f7b40d3496c3578eaa60dc7c18b7 100644 --- a/src/cutecoin/tests/stubs/core/registry/identities.py +++ b/src/cutecoin/tests/stubs/core/registry/identities.py @@ -20,7 +20,7 @@ class IdentitiesRegistry: return identity @asyncio.coroutine - def future_lookup(self, pubkey, community): + def future_find(self, pubkey, community): identity = Identity.empty(pubkey) yield from asyncio.sleep(1) return identity