From c84e55e957d654680aeac25fc25986445bdac07b Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 5 Feb 2024 12:47:20 +0000 Subject: [PATCH] wallet: (trivial) simplify class hierarchy legacy cruft --- electrum/wallet.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/electrum/wallet.py b/electrum/wallet.py index caa587e95..d5a5f29f8 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -3735,9 +3735,9 @@ class Deterministic_Wallet(Abstract_Wallet): return self.txin_type -class Simple_Deterministic_Wallet(Simple_Wallet, Deterministic_Wallet): - +class Standard_Wallet(Simple_Wallet, Deterministic_Wallet): """ Deterministic Wallet with a single pubkey per address """ + wallet_type = 'standard' def __init__(self, db, *, config): Deterministic_Wallet.__init__(self, db, config=config) @@ -3761,14 +3761,6 @@ class Simple_Deterministic_Wallet(Simple_Wallet, Deterministic_Wallet): def derive_pubkeys(self, c, i): return [self.keystore.derive_pubkey(c, i).hex()] - - - - - -class Standard_Wallet(Simple_Deterministic_Wallet): - wallet_type = 'standard' - def pubkeys_to_address(self, pubkeys): pubkey = pubkeys[0] return bitcoin.pubkey_to_address(self.txin_type, pubkey)