Repository navigation
friglet: drop control/config leftovers, wrappers and duplicate tests (SNB-664) - #53
Closed
setavenger wants to merge 2 commits into
Closed
setavenger wants to merge 2 commits into
setavenger wants to merge 2 commits into
Conversation
The Electrum server built the same things in several places. One copy of each now: - notification(): the JSON-RPC notification line (was written out four times); sp_subscription(): the SP subscription object and its notification, shared by the push task and the subscribe handler. - invalid_param(): the -32602 answer for a missing or mistyped first parameter (block.header, scripthash.subscribe/get_history, transaction.get); the messages are unchanged. - save_header_sidecar(): the header-sidecar write after a backfill and after a reorg. - Peer::header_by_hash() takes one hash (its only caller passed a one-element slice) and returns only a header with that hash, so the two re-checks of the same hash in ChainSource::header and backfill_header go. - relay: connect_settled() (connect + settle, the 2 s literal is now p2p::SETTLE_WAIT, also used by ChainSource::fee_filter), Candidate::wire_tx() and Signals::announce() replace two or three copies each. - index_unconfirmed_tx: two match arms that both did nothing are one condition. - Two tests build their request with call() like the others. The bytes on the wire are unchanged: a scripted session of 52 requests and 8 push batches gives byte-identical output before and after. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…(SNB-664) Leftovers from the live scanner swap and from earlier refactors: - ControlCtx keeps the Electrum index and the label addresses directly; the std Mutex around each was never written after the live rebuild-and-swap went away (#29). The Start comment that still described the swap is fixed. - One-line wrappers around friglet-ipc are gone (default_config_path, default_key_file, write_config_file, write_key_file, replace_scan_key); apply() writes the key it already parsed instead of having replace_scan_key parse it again. - pick_tip was `oracle.or(electrum)`; inlined, with its test. - control's unix_now duplicated pending::now_secs. - The key file's "first non-empty line" is read by one helper. - ResolvedConfig no longer copies oracle_url, max_label_num, http_addr and electrum_addr out of `raw`. - main no longer sets sp_start_height a second time right after rebuild_electrum_index_from_graph set it. - control::run takes the ControlCtx instead of a generic handler; its only other user was get_status_roundtrip_over_control_socket, which repeated friglet-ipc's roundtrip test and every serve_ctx test. - supervisor: stop_during_a_download_pauses_at_once repeated the cooperative-cancel tests and left a 30 s thread behind. - fake_peer: the single-field Seen struct is a Vec. - Stale comments: types.rs, the --oracle-url default, electrum::run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 3, 2026
Owner
Author
|
Merged into |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #46; review only the commits after it.
Part of the friglet cleanup (SNB-661). Implements SNB-664. Net −179 lines, no behaviour change.
What was removed and why
std::sync::MutexaroundControlCtx::electrum_indexandlabel_addresses: nothing has written them since the live rebuild-and-swap was removed (feat: restart friglet on settings changes and after crashes; start at login (SNB-624, SNB-52) #29). They are now plain fields. The Start comment that still talked about "rebuild + swap" is fixed.config::default_config_path,default_key_file,write_config_file,write_key_file,replace_scan_key.apply()already parses the new key, so it writeshex::encode(secret)withfriglet_ipc::write_key_file(.., true)(the same callreplace_scan_keymade after parsing the key a second time).pick_tipwasoracle.or(electrum); it is inlined and its test removed.control::unix_nowwas a copy ofpending::now_secs.key_file_line().ResolvedConfigno longer copiesoracle_url,max_label_num,http_addr,electrum_addrout ofraw; callers readcfg.raw.*.state_filestays separate because main replaces it with the per-wallet path.sp_start_heightwas set again in main right afterrebuild_electrum_index_from_graph(cfg.start_height)had set it. Nothing touches the index between the two.control::runwas generic over a handler only soget_status_roundtrip_over_control_socketcould pass a stub. That test (anddummy_status) repeated friglet-ipc's roundtrip test and everyserve_ctxtest.runnow takes theControlCtx.supervisor::stop_during_a_download_pauses_at_oncerepeated the cooperative-cancel tests and left a 30 s thread behind. The real-download version through the control socket (stop_during_a_stalled_p2p_download_pauses_within_a_second) stays.fake_peer::Seen(one field) is now aVec<String>.types.rs(only the HTTP server uses those types), the--oracle-urldefault (it follows the network), andelectrum::run(the scan task is no longerscan_block_range).Why behaviour is unchanged
Startup was checked with the real daemon (debug builds of #46's head and this branch) on copies of two state files:
blindbit-lib/src/scanner/testdata/state_before_owned_outputs.json, the old format withoutowned_outputsrecords.Setup: signet oracle, fixture keys. Time from spawn until the control socket answered
GetStatus, withoutputs_foundat that moment and again 3 s later, 3 runs each:The count's tolerant reader (
owned_outputs_count) and its test are unchanged.Verification
cargo check --workspace --all-targets --all-features: 0 warningscargo clippy --no-deps -p friglet -p friglet-ipc -p friglet-tray --all-targets -- -D warnings: cleancargo fmt -p friglet -p friglet-ipc -p friglet-tray -- --check: cleancargo test --workspace: 251 passed, 1 ignored, 0 failed. Base had 254; the 3 tests removed as duplicates arepick_tip_prefers_oracle_then_electrum,get_status_roundtrip_over_control_socketandstop_during_a_download_pauses_at_once. friglet's binary: 71 tests in 5.59 s.Left out on purpose
owned_outputs_countre-reading the state JSON: kept. Taking the count from the restored scanner changes what is reported for old-format files. On the fixture, the JSON gives 0, while the restored scanner holds 2 outputs, becausesync_owned_outputsfills them in from the indexer. Avoiding the second read without that change would need a blindbit-lib API.GetInfo-with-timeout written twice (config::fetch_oracle_tipvs the status poller): kept. The two use different timeouts (15 s vs 5 s), and only the poller reuses its client. They also produce different error texts, and the poller's reach the tray asoracle_error. A shared helper would need all three as parameters and would remove no lines.ControlCtx::pause_scanning's timeout branch (OkWithNote("stopping: …"), with the background save) and of Start'sStillStopping→Response::Erroranswer. The supervisor test covers only the supervisor's states.