trying to fix rebase

This commit is contained in:
Lex Berezhny 2019-05-28 22:17:45 -04:00
parent 6d462ad6d8
commit ad411cc157

View file

@ -2122,7 +2122,7 @@ class Daemon(metaclass=JSONRPCServerType):
) )
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
async def jsonrpc_channel_export(self, claim_id, password=None, account_id=None, insecure=False): async def jsonrpc_channel_export(self, claim_id, password=None, account_id=None):
""" """
Export serialized channel signing information for a given certificate claim id Export serialized channel signing information for a given certificate claim id
@ -2137,7 +2137,7 @@ class Daemon(metaclass=JSONRPCServerType):
""" """
account = self.get_account_or_default(account_id) account = self.get_account_or_default(account_id)
return await self.wallet_manager.export_certificate_info(claim_id, account, password, insecure) return await self.wallet_manager.export_certificate_info(claim_id, account, password)
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
async def jsonrpc_channel_import(self, serialized_certificate_info, password=None, account_id=None): async def jsonrpc_channel_import(self, serialized_certificate_info, password=None, account_id=None):