Commit 5f3a057
committed
Merge bitcoin/bitcoin#29262: rpc: Fix race in loadtxoutset
5555d8d test: Use blocks_path where possible (MarcoFalke)
fa91089 rpc: Fix race in loadtxoutset (MarcoFalke)
Pull request description:
The tip may have advanced, also if it did not, there is no reason to
have two variables point to the same block.
Fixes bitcoin/bitcoin#27596 (comment)
ACKs for top commit:
achow101:
ACK 5555d8d
pablomartin4btc:
ACK 5555d8d
BrandonOdiwuor:
Code Review ACK 5555d8d
Tree-SHA512: 23a82924a915b61bb1adab8ad20ec8914139c8ee647817af34ca27ee310a2e45833d8b285503e0feebe63e4667193d6d98cfcbbc1509bf40712225e04dd19e8bFile tree
2 files changed
+3
-5
lines changed- src/rpc
- test/functional/test_framework
2 files changed
+3
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2785 | 2785 | | |
2786 | 2786 | | |
2787 | 2787 | | |
2788 | | - | |
2789 | 2788 | | |
2790 | 2789 | | |
2791 | 2790 | | |
2792 | | - | |
2793 | | - | |
| 2791 | + | |
| 2792 | + | |
2794 | 2793 | | |
2795 | 2794 | | |
2796 | 2795 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1021 | 1021 | | |
1022 | 1022 | | |
1023 | 1023 | | |
1024 | | - | |
1025 | | - | |
| 1024 | + | |
0 commit comments