ivanlele
aa41e29f97
Merge 3a29ff5dea into merged_master (Bitcoin PR bitcoin/bitcoin#30463 )
2026-03-09 16:54:19 +00:00
ikripaka
17631653e2
Merge 5ee6b76c69 into merged_master (Bitcoin PR bitcoin/bitcoin#29325 )
2026-02-26 20:15:02 +00:00
Byron Hambly
474dd0f6f9
Merge 7143d43884 into merged_master (Bitcoin PR bitcoin/bitcoin#28948 )
2025-12-03 19:08:52 +00:00
Byron Hambly
769260634b
Merge 8339f3cea8 into merged_master (Bitcoin PR bitcoin/bitcoin#26886 )
2025-04-02 21:57:11 +02:00
Tom Trevethan
15bc30b2c3
Merge 599e941c19 into merged_master (Bitcoin PR bitcoin/bitcoin#26657 )
2025-04-02 16:04:31 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
0b0d5d214e
Merge 8597260872 into merged_master (Bitcoin PR bitcoin/bitcoin#26480 )
2025-03-04 10:42:21 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Hennadii Stepanov
a0473442d1
scripted-diff: Add __file__ argument to BitcoinTestFramework.init()
...
-BEGIN VERIFY SCRIPT-
sed -i -e 's/\s*().main\s*()/(__file__).main()/' $(git ls-files test/functional/*.py)
sed -i -e 's/def __init__(self)/def __init__(self, test_file)/' test/functional/test_framework/test_framework.py
-END VERIFY SCRIPT-
2024-07-16 22:06:47 +01:00
Ava Chow
429ec1aaaa
refactor: Rename CTransaction::nVersion to version
...
In order to ensure that the change of nVersion to a uint32_t in the
previous commit has no effect, rename nVersion to version in this commit
so that reviewers can easily spot if a spot was missed or if there is a
check somewhere whose semantics have changed.
2024-06-07 13:55:23 -04:00
MarcoFalke
27c8786ba9
test framework: Add and use option for tx-version in MiniWallet methods
2024-02-08 21:50:55 +00:00
Byron Hambly
b50c367ff6
Merge 3a36ec83d0 into merged_master (Bitcoin PR bitcoin/bitcoin#23521 )
2023-05-29 13:17:22 +00:00
Byron Hambly
bd68371fb6
Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474 )
2023-05-26 10:32:04 +00:00
James Dorfman
4fbdbb640e
Merge ffcb4374c4 into merged_master (Bitcoin PR bitcoin/bitcoin#23498 )
2023-05-24 18:15:21 +00:00
Byron Hambly
af3fe60b69
Merge 94db963de5 into merged_master (Bitcoin PR bitcoin/bitcoin#23300 )
2023-05-17 13:44:36 +00:00
Byron Hambly
1c0f4948ec
Merge b4437d7dfe into merged_master (Bitcoin PR bitcoin/bitcoin#23210 )
2023-05-10 11:04:50 +00:00
Byron Hambly
7856df2733
test: elements fixes for Bitcoin PR bitcoin/bitcoin#22818
2023-04-24 08:30:36 +00:00
Byron Hambly
13fb374543
Merge 8e9801bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22818 )
2023-04-24 07:13:42 +00:00
Byron Hambly
56c954f2c0
Merge 6d76b57ca0 into merged_master (Bitcoin PR bitcoin/bitcoin#22960 )
2023-04-21 11:35:05 +00:00
James Dorfman
ae89c4bc51
Merge a5d00d4baf into merged_master (Bitcoin PR bitcoin/bitcoin#22788 )
2023-04-21 04:02:55 +00:00
kouloumos
42029a7fd4
test: remove redundant blocks generation logic
...
those tests already have enough mature utxos from the pre-mined chain.
2023-01-16 19:14:11 +02:00
Miles Liu
4159ccd031
test: Run feature_bip68_sequence.py with MiniWallet
2023-01-06 09:52:39 +08:00
Hennadii Stepanov
306ccd4927
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
- 2021: f47dda2c58fa0074e2d8aaaaad6ac9
2022-12-24 23:49:50 +00:00
MacroFake
555519d082
test: Remove wallet option from non-wallet tests
...
Review note: The changes are complete, because self.options.descriptors
is set to None in parse_args (test_framework.py).
A value of None implies -disablewallet, see the previous commit.
So if a call to add_wallet_options is missing, it will lead to a test
failure when the wallet is compiled in.
2022-11-10 17:19:13 +01:00
MacroFake
fa8a305ddd
test: Remove confusing DUMMY_P2WPKH_SCRIPT
2022-10-07 13:11:05 +02:00
Sebastian Falbesoner
df5d783aef
test: refactor: take use of create_block txlist parameter
...
Passing a list of transactions `txlist` to `create_block` appends
them to the block, hence we don't need to do that manually anymore.
The merkle root calculation can also be removed, since this is done
in the end of the helper.
2021-11-17 15:45:30 +01:00
fanquake
ffdab41f94
Merge bitcoin/bitcoin#23474 : test: scripted-diff cleanups after generate* changes
...
fac23c2114fa974f1f14fad13991aefaeff5770994db963de5fac23c2114
2021-11-16 11:22:06 +08:00
Sebastian Falbesoner
a9872e1478
test: remove unnecessary block rehashing prior to solving
...
Solving a block involves continously rehashing it, i.e. any extra
calls to rehash it before are not necessary and can be dropped.
2021-11-12 18:29:43 +01:00
MarcoFalke
fac23c2114
scripted-diff: Bump copyright headers
...
The previous diff touched most files in ./test/, so bump the headers to
avoid having to touch them again for a bump later.
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./test/
-END VERIFY SCRIPT-
2021-11-10 11:10:24 +01:00
MarcoFalke
facc352648
test: Implicitly sync after generate*, unless opted out
2021-10-29 13:34:52 +02:00
MarcoFalke
fa2ac5881e
test: Replace satoshi_round with int() or Decimal()
...
satoshi_round will round down. To make the code easier to parse use
Decimal() where possible, which does not round. Or use int(), which
explicitly rounds down.
2021-10-06 15:16:59 +02:00
MarcoFalke
fa4db8671b
test: Activate all regtest softforks at height 1, unless overridden
2021-09-16 18:53:04 +02:00
MarcoFalke
fad4f44645
test: Set peertimeout in write_config
...
This avoids having to remember to set it whenever mocktime is used with
peer connections. Also, it might help avoiding disconnects when
attaching a debugger to a running test.
2021-09-13 09:41:58 +02:00
Andrew Poelstra
36e5e2a7f1
Merge 9a154599fe into merged_master (Elements PR ElementsProject/elements#900 )
...
Surprisingly easy to do. Almost all of the diff resolution was mechanically
* replacing boost::variant with std::variant
* replacing Optional with std::optional
* then replacing `nullopt` with `std::nullopt`
* updating the RPC functions for the new RPCArg::Default type
* update the tests/ directory to make new (since 22) tests use arrays for
createrawtransaction outputs
* other ad-hoc changes to function parameters etc (not too many of these)
I had to "really" change the code in PrecomputePSBTData, which was introduced
in 22.0 and affected by PSET, but this function was like 8 lines long so it
was easy.
Reviewing the diff may be a bit difficult because of the mix of mechanical
changes and ad-hoc things. Probably the most straightforward thing to do
is to redo the merge, `sed -i` to fix the boost::variant and Optional stuff,
then diff the remaining conflicts against this commit.
TODO: grep for `blindpsbt` and you will see that this RPC is still referenced
in documentation and help text even though it was deleted. Need to fix this
in 0.21 in a separate PR.
2021-09-04 19:34:14 +00:00
MarcoFalke
fa0b916971
scripted-diff: Use generate* from TestFramework
...
-BEGIN VERIFY SCRIPT-
sed --regexp-extended -i \
's/((self\.)?(nodes\[[^]]+\]|[a-z_]*(wallet|node)[0-9a-z_]*))\.(generate(|toaddress|block|todescriptor)(\(|, ))/self.\5\1, /g' \
$(git grep -l generate ./test | grep -v 'test_framework/' | grep -v 'feature_rbf')
-END VERIFY SCRIPT-
2021-09-02 10:34:35 +02:00
Andrew Poelstra
083e08cf82
Merge d6a59166a1 into merged_master (Bitcoin PR bitcoin/bitcoin#22257 )
...
Just as mechanical and annoying as it looks.
2021-07-28 21:06:57 +00:00
Andrew Chow
d8fa5c1458
Use createtx array outputs
2021-06-22 14:42:19 -04:00
Sebastian Falbesoner
a79396fe5f
test: remove ToHex helper, use .serialize().hex() instead
2021-06-21 14:30:03 +02:00
Sebastian Falbesoner
2ce7b47958
test: introduce tx_from_hex helper for tx deserialization
...
`FromHex` is mostly used for transactions, so we introduce a
shortcut `tx_from_hex` for `FromHex(CTransaction, hex_str)`.
2021-06-21 14:28:05 +02:00
Andrew Poelstra
27930edc9c
Merge 4a540683ec into merged_master (Bitcoin PR #20813 )
2021-06-16 14:11:07 +00:00
MarcoFalke
fa0074e2d8
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
2020-12-31 09:45:41 +01:00
Andrew Poelstra
b733f588d8
Merge cb21d864c5 into merged_master (Bitcoin PR #19401 )
2020-12-01 05:14:13 +00:00
Andrew Poelstra
c98788b086
Merge cb1ee1551c into merged_master (Bitcoin PR #19674 )
2020-11-27 14:17:51 +00:00
Andrew Poelstra
aef7078adf
Merge 107b8559c5 into merged_master (Bitcoin PR #18638 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
6ecadd8588
Merge 29637a5c56 into merged_master (Bitcoin PR #18745 )
2020-11-26 01:08:29 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
5574cf1730
Merge 6c7da0736d into merged_master (Bitcoin PR #17108 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
1b3ae6c58b
Merge fecc1be231 into merged_master (Bitcoin PR #16884 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
5f280a6068
Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
b57516e11a
Merge 24dbcf3808 into merged_master (Bitcoin PR #15891 )
...
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
2020-11-09 21:20:06 +00:00
