trm duplicate method getpubkey - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2e1d24939ccb46123974f3338963a65191883981
DIR parent b5b5edbee7c84132c2cf77a4cbd649c6d6cad305
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 6 Jul 2014 22:24:09 +0200
rm duplicate method getpubkey
Diffstat:
M gui/qt/main_window.py | 2 +-
M lib/commands.py | 2 +-
M lib/wallet.py | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1987,7 +1987,7 @@ class ElectrumWindow(QMainWindow):
pubkey_e = QLineEdit()
if address:
- pubkey = self.wallet.getpubkeys(address)[0]
+ pubkey = self.wallet.get_public_keys(address)[0]
pubkey_e.setText(pubkey)
layout.addWidget(QLabel(_('Public key')), 2, 0)
layout.addWidget(pubkey_e, 2, 1)
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -207,7 +207,7 @@ class Commands:
def getpubkeys(self, addr):
out = { 'address':addr }
- out['pubkeys'] = self.wallet.getpubkeys(addr)
+ out['pubkeys'] = self.wallet.get_public_keys(addr)
return out
def getbalance(self, account= None):
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -354,12 +354,6 @@ class Abstract_Wallet:
raise Exception("Address not found", address)
- def getpubkeys(self, addr):
- assert is_address(addr) and self.is_mine(addr)
- account, sequence = self.get_address_index(addr)
- a = self.accounts[account]
- return a.get_pubkeys( sequence )
-
def get_private_key(self, address, password):
if self.is_watching_only():
return []
t@@ -386,7 +380,6 @@ class Abstract_Wallet:
mpk = [ self.master_public_keys[k] for k in self.master_private_keys.keys() ]
for xpub, sequence in xpub_list:
if xpub in mpk:
- print "can sign", xpub
return True
return False