Skip to content

split rest and electrum tests #182

Closed
philippem wants to merge 17 commits intoBlockstream:new-indexfrom
philippem:split-tests-up
Closed

split rest and electrum tests #182
philippem wants to merge 17 commits intoBlockstream:new-indexfrom
philippem:split-tests-up

Conversation

@philippem
Copy link
Collaborator

  • split the rest and electrum integration tests up into separate functions
  • reformat (using cargo fmt) some files

@philippem philippem requested review from RCasatta and shesek February 11, 2026 18:10
@philippem philippem force-pushed the split-tests-up branch 2 times, most recently from 47704d9 to b6af7ad Compare February 12, 2026 19:32
@philippem philippem requested a review from Randy808 February 19, 2026 15:33
shesek and others added 17 commits February 19, 2026 07:35
It makes more sense there, since it doesn't depend on any of the data
added to the txstore in the first `add` stage.

And it needs to be there, for the followup commit that assumes all
entries in the history db can be safely deleted when undoing blocks.
Prior to this change, history index entries created by stale blocks
would remain in the history DB and only get discarded at read time.

This change explicitly removes history entries when a reorg occurs,
so we can assume all indexed entries correspond to blocks currently
still part of the best chain.

This enables optimizing some db lookups (in the followup commits),
since readers no longer need to account for stale entries.

(Note schema.md was only corrected to match the existing schema, 'D'
rows were already being kept for both the history and txstore dbs.)
Iterating history db entries now involves a single sequential db scan
(plus reads into the in-memory HeaderList), without the per-tx random
access db reads that were previously needed to verify confirmation status.
Changed from an index of `txid -> Set<blockhash>` to `txid -> blockheight`

- Instead of a list of blocks seen to include the txid (including
  stale blocks), map the txid directly to the single block that
  confirmed it and is still part of the best chain.

- Identify blocks by their height instead of their hash. Previously it
  was necessary to keep the hash to ensure it is still part of the best
  chain, but now we can assume that it is.

- Move the index from the txstore db to the history db, so that its
  entries will get undone during reorgs.
Changed from an index of `funding_txid:vout -> Set<spending_txid:vin>`
to `funding_txid:vout -> spending_txid:vin||spending_height`

- Instead of a list of inputs seen to spend the outpoint, map the
  outpoint directly to the single spending input that is still part of
  the best chain.

- Keep the height of the spending transaction, too. This reduces the
  number of db reads per spend lookup from 2 to 1.
Now possible with the V2 schema, since the exact TxEdge row key can be
derived from the funding_txid:vout alone (previously the key also
included the spending_txid, requiring a prefix scan for each lookup).
Now possible with the V2 schema, since the exact TxConf row key can be
derived from the txid alone (previously the key also included the block,
requiring a prefix scan for each lookup).

This isn't used anywhere yet, but will be used in a followup commit for
the DB migration script (and could potentially be used for a new public
API endpoint).

Exposed as a standalone function so that it can be used directly with a
`DB`, without having to construct the full `ChainQuery` with a `Daemon`.
- Change lookup_txns to use MultiGet

- Use lookup_txns for block transactions and reconstruction too
  (GET /block/:hash/txs and GET /block/:hash/raw)

(This was already possible with the V1 schema, but related to and
builds upon the other V2 changes.)

Plus some related changes:

- Remove expensive sanity check assertion in lookup_txn (involved txid
  computation and wasn't really necessary)

- Add test for raw block reconstruction
Previously each key/value read during iteration was getting duplicated 😮

(This doesn't strictly belong to the PR its included in, but it will
greatly benefit the DB migration script.)
Also adds HeaderList::best_height() to help avoid off-by-one errors for
the chain length vs tip height (like I initially made when implementing
this >.<), and to make getting the tip height of an empty HeaderList an
explicit error (previously it over overflow and return usize::MAX).
Prior to this fix, `Indexer::update()` would panic on the
`assert_eq!(tip, *headers.tip())` assertion when handling reorgs that
shorten the existing chain without adding any blocks to replace them.

This should not normally happen, but might due to manual `invalidateblock`.
For example, this will reproduce the panic:
`bitcoin-cli invalidateblock $(bitcoin-cli getbestblockhash)`
- split REST tests up
- split electrum tests up
- expand REST tests
- make port allocation more robust for test runner
- reformat some functions with cargo fmt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Comments