starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-09-28 01:56:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify WalletPuzzleStore by using row_to_record in two more places (#12341)

Browse Source
This commit is contained in:
Arvid Norberg
2022-07-25 08:51:28 -05:00
committed by GitHub
parent 3e996f8be5
commit eabb440c06
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chia/wallet/wallet_puzzle_store.py
+5 -19
View File
@@ -123,14 +123,7 @@ class WalletPuzzleStore:
)
if row is not None and row[0] is not None:
return DerivationRecord(
uint32(row[0]),
bytes32.fromhex(row[2]),
G1Element.from_bytes(bytes.fromhex(row[1])),
WalletType(row[3]),
uint32(row[4]),
bool(row[5]),
)
return self.row_to_record(row)
return None
@@ -147,14 +140,7 @@ class WalletPuzzleStore:
)
if row is not None and row[0] is not None:
return DerivationRecord(
uint32(row[0]),
bytes32.fromhex(row[2]),
G1Element.from_bytes(bytes.fromhex(row[1])),
WalletType(row[3]),
uint32(row[4]),
bool(row[5]),
)
return self.row_to_record(row)
return None
@@ -203,7 +189,7 @@ class WalletPuzzleStore:
G1Element.from_bytes(bytes.fromhex(row[1])),
WalletType(row[3]),
uint32(row[4]),
bool(row[6]),
bool(row[5]),
)
async def index_for_pubkey(self, pubkey: G1Element) -> Optional[uint32]:
@@ -231,7 +217,7 @@ class WalletPuzzleStore:
async with self.db_wrapper.reader_no_transaction() as conn:
row = await execute_fetchone(
conn,
"SELECT derivation_index, pubkey, puzzle_hash, wallet_type, wallet_id, used, hardened "
"SELECT derivation_index, pubkey, puzzle_hash, wallet_type, wallet_id, hardened "
"FROM derivation_paths "
"WHERE pubkey=?",
(bytes(pubkey).hex(),),
@@ -258,7 +244,7 @@ class WalletPuzzleStore:
async with self.db_wrapper.reader_no_transaction() as conn:
row = await execute_fetchone(
conn,
"SELECT derivation_index, pubkey, puzzle_hash, wallet_type, wallet_id, used, hardened "
"SELECT derivation_index, pubkey, puzzle_hash, wallet_type, wallet_id, hardened "
"FROM derivation_paths "
"WHERE puzzle_hash=?",
(puzzle_hash.hex(),),