remove obsolete function erase from SFFile

This commit is contained in:
scgbckbone 2024-06-20 19:50:35 +02:00 committed by doc-hex
parent 7e1b6dd7b5
commit 13365dc258
5 changed files with 2 additions and 23 deletions

View File

@ -817,14 +817,11 @@ class ApproveTransaction(UserAuthorizedAction):
try:
# re-serialize the PSBT back out
with SFFile(TXN_OUTPUT_OFFSET, max_size=MAX_TXN_LEN, message="Saving...") as fd:
await fd.erase()
if self.do_finalize:
txid = self.psbt.finalize(fd)
else:
self.psbt.serialize(fd)
#fd.flush_out() not needed - flush is part of __exit__
self.result = (fd.tell(), fd.checksum.digest())
self.done(redraw=(not txid))
@ -917,8 +914,6 @@ class ApproveTransaction(UserAuthorizedAction):
chk = self.chain.hash_message(msg_len=txt_len) if sign_text else None
with SFFile(TXN_OUTPUT_OFFSET, max_size=txt_len+300, message="Visualizing...") as fd:
await fd.erase()
while 1:
blk = msg.read(256).encode('ascii')
if not blk: break
@ -1103,9 +1098,6 @@ async def sign_psbt_file(filename, force_vdisk=False, slot_b=None):
total = 0
with SFFile(TXN_INPUT_OFFSET, max_size=psbt_len) as out:
# blank flash
await out.erase()
while 1:
n = fd.readinto(tmp_buf)
if not n: break
@ -1183,7 +1175,6 @@ async def sign_psbt_file(filename, force_vdisk=False, slot_b=None):
base+'-final.txn' if not del_after else 'tmp.txn', out_path)
with SFFile(TXN_OUTPUT_OFFSET, max_size=MAX_TXN_LEN, message="Saving...") as fd0:
await fd0.erase()
txid = psbt.finalize(fd0)
fd0.flush_out() # need to flush here as we are probably not gona call .read( again
tx_len, tx_sha = fd0.tell(), fd0.checksum.digest()

View File

@ -425,8 +425,6 @@ async def write_complete_backup(words, fname_pattern, write_sflash=False,
from sffile import SFFile
with SFFile(0, max_size=MAX_BACKUP_FILE_SIZE, message='Saving...') as fd:
await fd.erase()
if zz:
fd.write(hdr)
fd.write(zz.body)

View File

@ -587,7 +587,6 @@ class NFCHandler:
else:
psbt.serialize(fd)
# fd.flush_out() not needed - flush is part of __exit__
self.result = (fd.tell(), fd.checksum.digest())
out_len, out_sha = self.result

View File

@ -67,13 +67,6 @@ class SFFile:
assert 0 <= offset <= self.length # "bad offset"
self.pos = offset
async def erase(self):
# must be used by caller before writing any bytes
# - now just checks, used to be a slow erase cycle
assert not self.readonly
assert self.length == 0 # 'already wrote?'
return
def __enter__(self):
if self.message:
from glob import dis
@ -101,6 +94,8 @@ class SFFile:
self.runt = None
self.wr_pos = self.pos
close = flush_out
def write(self, b):
# immediate write, no buffering
assert not self.readonly
@ -174,9 +169,6 @@ class SizerFile(SFFile):
def __init__(self):
self.pos = self.length = 0
async def erase(self):
return
def __enter__(self):
return self

View File

@ -976,7 +976,6 @@ async def qr_psbt_sign(decoder, psbt_len, raw):
else:
psbt.serialize(fd)
#psram.flush_out() not needed - flush is part of __exit__
data_len, sha = psram.tell(), fd.checksum.digest()
UserAuthorizedAction.cleanup()