backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving `generate*` to TestFramework) #6288

kwvg · 2024-09-26T20:40:09Z

Additional Information

bitcoin#23207 has been marked partial as test/functional/wallet_transactiontime_rescan.py has not been backported yet.
bitcoin#22550 has been partially backported to track changes to generate_to_height() made in successive backports.

develop (5a0479fe, build)

dash#6288 (ecb51351, build)

Running Unit Tests for Test Framework Modules
                       
----------------------------------------------------------------------
Ran 18 tests in 32.370s
OK
1/266 - wallet_hd.py --legacy-wallet passed, Duration: 12 s
[...]
feature_bind_port_discover.py                      | ○ Skipped | 1 s
feature_bind_port_externalip.py                    | ○ Skipped | 1 s
interface_usdt_net.py                              | ○ Skipped | 1 s
interface_usdt_utxocache.py                        | ○ Skipped | 1 s
interface_usdt_validation.py                       | ○ Skipped | 1 s
rpc_bind.py --ipv6                                 | ○ Skipped | 1 s
ALL                                                | ✓ Passed  | 6961 s (accumulated) 
Runtime: 1779 s

Running Unit Tests for Test Framework Modules
                        
----------------------------------------------------------------------
Ran 18 tests in 32.318s
OK
1/266 - wallet_hd.py --legacy-wallet passed, Duration: 19 s
[...]
feature_bind_port_discover.py                      | ○ Skipped | 1 s
feature_bind_port_externalip.py                    | ○ Skipped | 1 s
interface_usdt_net.py                              | ○ Skipped | 1 s
interface_usdt_utxocache.py                        | ○ Skipped | 1 s
interface_usdt_validation.py                       | ○ Skipped | 1 s
rpc_bind.py --ipv6                                 | ○ Skipped | 1 s
ALL                                                | ✓ Passed  | 7048 s (accumulated) 
Runtime: 1825 s

Breaking Changes

None expected.

Checklist

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas (note: N/A)
I have added or updated relevant unit/integration/functional/e2e tests
I have made corresponding changes to the documentation (note: N/A)
I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

github-actions · 2024-09-27T01:15:11Z

This pull request has conflicts, please rebase.

UdjinM6

pls see 2c20e87 + 22741 should be partial I guess (missing changes in test/functional/rpc_signrawtransaction.py, too early)

github-actions · 2024-10-01T14:48:03Z

This pull request has conflicts, please rebase.

UdjinM6

utACK ecb5135

github-actions · 2024-10-03T04:14:15Z

This pull request has conflicts, please rebase.

partial: - 746f203 (only changes in test_framework/util.py)

UdjinM6

utACK 4a4905a

PastaPastaPasta · 2024-10-04T18:52:16Z

LGTM; lets mark

partial bitcoin#22741: Add generate* calls to test framework
partial bitcoin#23207: Delete generate* calls from TestNode

as fully done; the stuff they exclude will be trivially detected as soon as someone backports those scripts because they will fail :) it's just annoying to have these as "partial" for no real benefit to maintaining imo.

Co-authored-by: UdjinM6 <[email protected]>

PastaPastaPasta

utACK 131d161; no diff rebase, going to merge

…ollow-up dash#6276) 9b0c506 test: call `self.generate()` in `p2p_net_deadlock.py` (Kittywhiskers Van Gogh) Pull request description: ## Additional Information `develop` is currently borked ([build](https://gitlab.com/dashpay/dash/-/jobs/7999893074#L266)) because [dash#6288](#6288) changed the expected syntax for `generate*` calls and [dash#6276](#6276) introduced a new test (`p2p_net_deadlock.py`) that was based on a version of `develop` that used the older syntax. No conflicts were reported because it was a new file introduced in the latter PR that the former PR did not have knowledge of. ## Breaking changes None expected. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 9b0c506 PastaPastaPasta: utACK 9b0c506 Tree-SHA512: 3b49f0ff4fc5beea8bd48019c581577ebb47cf50c5526e60367740e5deea7fc92451a480abd49b2b3b2a7be7fb9ca2a4aca99c565ef7aaee1ba8cce43e0be776

, bitcoin#23223, bitcoin#23564, bitcoin#23538, bitcoin#23437, bitcoin#23630, bitcoin#23465, bitcoin#23738, bitcoin#17631, bitcoin#22875 (auxiliary backports: part 18) 5aceee3 merge bitcoin#22875: Fix Racy ParseOpCode function initialization (Kittywhiskers Van Gogh) 427d07f merge bitcoin#17631: Expose block filters over REST (Kittywhiskers Van Gogh) d60f15e merge bitcoin#23738: improve logging of ChainstateManager snapshot persistance (Kittywhiskers Van Gogh) 8725734 merge bitcoin#23465: Remove CTxMemPool params from ATMP (Kittywhiskers Van Gogh) d2cbdc4 merge bitcoin#23630: Remove GetSpendHeight (Kittywhiskers Van Gogh) 8bdab4d merge bitcoin#23437: AcceptToMemoryPool (Kittywhiskers Van Gogh) 1f4e8a0 merge bitcoin#23538: Remove strtol in torcontrol (Kittywhiskers Van Gogh) 2318d9f merge bitcoin#23564: don't use deprecated brew package names (Kittywhiskers Van Gogh) 3b7a739 merge bitcoin#23223: Disable lock contention logging in checkqueue_tests (Kittywhiskers Van Gogh) b383609 merge bitcoin#23227: Avoid treating integer overflow as OP_0 (Kittywhiskers Van Gogh) 0188d32 merge bitcoin#23213: Return error when header count is not integral (Kittywhiskers Van Gogh) eb9e208 merge bitcoin#23156: Remove unused ParsePrechecks and ParseDouble (Kittywhiskers Van Gogh) 18fff7e rpc: switch to taking an integer for `rate` in `quorum dkgsimerror` (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6288 * Dependent on #6296 ## Breaking changes - `quorum dkgsimerror` will no longer accept a decimal value between 0 and 1 for the `rate` argument, it will now expect an integer between 0 to 100. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 5aceee3 UdjinM6: utACK 5aceee3 knst: utACK 5aceee3 Tree-SHA512: 8fc34b05a74f2ddbe84b2a7a54772e49941042c89bc74d71d33711e658754a3d086af11fb2437d2bb72ede0c611adc57b82193783e7b6f10fbd4ebab2a7fa7cb

…ups after generate* changes 0b1d83a Bump copyright headers (Konstantin Akimov) 98c50c9 fix: recovery missing syncs for Dash Specific tests (Konstantin Akimov) 31718c7 scripted-diff: Remove redundant sync_all and sync_blocks (Konstantin Akimov) 7e90bd1 fix: remove sync-no-op for generate blocks in Dash functional tests (Konstantin Akimov) ac269a0 test: Properly set sync_fun in NodeNetworkLimitedTest (MarcoFalke) 356cb44 test: Use 4 spaces for indentation (MarcoFalke) Pull request description: ## What was done? The majority of changes in this backport are scripted, better to keep commits as they are rather than squash together. Original description: > Some cleanups after #6288 (see bitcoin#23300) ## How Has This Been Tested? Run unit functional tests. ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 0b1d83a Tree-SHA512: 48285d82c79004c5f39bd7610729f0ba8539df3cf5063905354c7dc9bcff0e05502049b97068813cec685e3227f7abec22a16435021b81c24d3706dc25df4de7

kwvg added this to the 21.2 milestone Sep 26, 2024

github-actions bot added the needs rebase label Sep 27, 2024

kwvg force-pushed the test_generate branch from e0e9736 to 239ebf7 Compare September 30, 2024 11:09

github-actions bot removed the needs rebase label Sep 30, 2024

kwvg marked this pull request as ready for review September 30, 2024 14:23

kwvg requested review from PastaPastaPasta, UdjinM6 and knst September 30, 2024 14:23

UdjinM6 reviewed Oct 1, 2024

View reviewed changes

kwvg mentioned this pull request Oct 1, 2024

backport: merge bitcoin#23156, #23213, #23227, #23223, #23564, #23538, #23437, #23630, #23465, #23738, #17631, #22875 (auxiliary backports: part 18) #6297

Merged

5 tasks

github-actions bot added the needs rebase label Oct 1, 2024

kwvg force-pushed the test_generate branch from 239ebf7 to ecb5135 Compare October 1, 2024 19:39

github-actions bot removed the needs rebase label Oct 1, 2024

UdjinM6 previously approved these changes Oct 1, 2024

View reviewed changes

github-actions bot added the needs rebase label Oct 3, 2024

partial bitcoin#22550: improve test_signing_with_{csv,cltv} subtests

9938f44

partial: - 746f203 (only changes in test_framework/util.py)

kwvg dismissed UdjinM6’s stale review via 4a4905a October 3, 2024 21:38

kwvg force-pushed the test_generate branch from ecb5135 to 4a4905a Compare October 3, 2024 21:38

github-actions bot removed the needs rebase label Oct 3, 2024

kwvg requested a review from UdjinM6 October 3, 2024 21:38

UdjinM6 approved these changes Oct 4, 2024

View reviewed changes

kwvg changed the title ~~backport: merge bitcoin#22741, #22788, #23300, partial bitcoin#22550, #23207 (moving generate* to TestFramework)~~ backport: merge bitcoin#22788, #23300, partial bitcoin#22741, #22550, #23207 (moving generate* to TestFramework) Oct 4, 2024

kwvg and others added 4 commits October 4, 2024 19:00

merge bitcoin#22741: Add generate* calls to test framework

c17fd8b

merge bitcoin#22788: Use generate* from TestFramework

7d3c3b4

merge bitcoin#23207: Delete generate* calls from TestNode

3dcd875

test: remove redundant self.nodes from self.sync_{blocks,all}

e913a45

Co-authored-by: UdjinM6 <[email protected]>

kwvg and others added 6 commits October 4, 2024 19:01

merge bitcoin#23300: Implicitly sync after generate*, unless opted out

9b3fbdd

test: move differing sync logic into sync_fun lambda in Dash tests

82da45a

Co-authored-by: UdjinM6 <[email protected]>

test: opt-out of post-generate* syncing in some Dash tests

1367115

Co-authored-by: UdjinM6 <[email protected]>

test: remove redundant sync after generate* calls in Dash tests

a99a39c

test: remove redundant sync after generate* calls in Bitcoin tests

dfeeb34

test: cleanup generate logic in some governance functional tests

131d161

Co-authored-by: UdjinM6 <[email protected]>

kwvg force-pushed the test_generate branch from 4a4905a to 131d161 Compare October 4, 2024 19:01

kwvg changed the title ~~backport: merge bitcoin#22788, #23300, partial bitcoin#22741, #22550, #23207 (moving generate* to TestFramework)~~ backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving generate* to TestFramework) Oct 4, 2024

PastaPastaPasta approved these changes Oct 4, 2024

View reviewed changes

PastaPastaPasta merged commit c77994f into dashpay:develop Oct 4, 2024
25 of 34 checks passed

kwvg mentioned this pull request Oct 5, 2024

test: call self.generate() in p2p_net_deadlock.py (follow-up dash#6276) #6315

Merged

5 tasks

UdjinM6 modified the milestones: 21.2, 22 Oct 29, 2024

knst mentioned this pull request Feb 17, 2025

backport: Merge #23474: test: scripted-diff cleanups after generate* changes #6584

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving `generate*` to TestFramework) #6288

backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving `generate*` to TestFramework) #6288

Uh oh!

kwvg commented Sep 26, 2024 •

edited

Loading

Uh oh!

github-actions bot commented Sep 27, 2024

Uh oh!

UdjinM6 left a comment

Uh oh!

github-actions bot commented Oct 1, 2024

Uh oh!

UdjinM6 left a comment

Uh oh!

github-actions bot commented Oct 3, 2024

Uh oh!

UdjinM6 left a comment

Uh oh!

PastaPastaPasta commented Oct 4, 2024

Uh oh!

PastaPastaPasta left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving generate* to TestFramework) #6288

backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving generate* to TestFramework) #6288

Uh oh!

Conversation

kwvg commented Sep 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional Information

Breaking Changes

Checklist

Uh oh!

github-actions bot commented Sep 27, 2024

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 1, 2024

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 3, 2024

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented Oct 4, 2024

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving `generate*` to TestFramework) #6288

backport: merge bitcoin#22741, #22788, #23207, #23300, partial bitcoin#22550 (moving `generate*` to TestFramework) #6288

kwvg commented Sep 26, 2024 •

edited

Loading