Commit f9486de
committed
Merge bitcoin#30029: test: remove duplicate
af3c181 [test]: remove duplicate WITNESS_SCALE_FACTOR (ismaelsadeeq)
Pull request description:
Notice this while working on bitcoin#29523
- `blocktools.py` and `messages.py` both define `WITNESS_SCALE_FACTOR` constant
https://github.com/bitcoin/bitcoin/blob/99d7538cdb2a0ab7a7a2116cd5f33b95fc52b00e/test/functional/test_framework/blocktools.py#L48
https://github.com/bitcoin/bitcoin/blob/99d7538cdb2a0ab7a7a2116cd5f33b95fc52b00e/test/functional/test_framework/messages.py#L68
- This PR deletes the one in `blocktools.py` and update the tests to only use `WITNESS_SCALE_FACTOR` from `messages.py`
ACKs for top commit:
maflcko:
ACK af3c181
sipa:
ACK af3c181
achow101:
ACK af3c181
glozow:
lgtm ACK af3c181
brunoerg:
ACK af3c181
willcl-ark:
ACK af3c181
Tree-SHA512: 6bd8060c9eea10e03940acee2aa4cd08e4e0afb6d26be3e6300ad405fd0af5b373a00e994eb39515a2dcafa1625562bcd57945049a84b9c9dcc7ea60c24f0911WITNESS_SCALE_FACTOR constant definitionFile tree
2 files changed
+2
-2
lines changed- test/functional
- test_framework
2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
| |||
20 | 19 | | |
21 | 20 | | |
22 | 21 | | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
48 | | - | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
0 commit comments