[0.21] test: Backports #21614

1. 
   MarcoFalke commented at 9:29 AM on April 6, 2021: member

   Backport tests

2. fanquake added the label Backport on Apr 6, 2021
3. fanquake added this to the milestone 0.21.1 on Apr 6, 2021
4. 
   fanquake commented at 9:32 AM on April 6, 2021: member

   Should/can this include a backport for #21489?

5. MarcoFalke cross-referenced this on Apr 6, 2021 from issue fuzz: cleanups for versionbits fuzzer by ajtowns
6. MarcoFalke cross-referenced this on Apr 6, 2021 from issue test: make sure non-IP peers get discouraged and disconnected (vasild) by MarcoFalke
7. 
   MarcoFalke commented at 9:40 AM on April 6, 2021: member

   Good idea. Done

8. in src/test/fuzz/versionbits.cpp:352 in 7ed4ddb5ad outdated

    348 | @@ -343,3 +349,4 @@ void test_one_input(const std::vector<uint8_t>& buffer)
    349 |          }
    350 |      }
    351 |  }
    352 | +} // namespace
   

   ---

   ---

   

   ajtowns commented at 4:54 AM on April 7, 2021:

   This } // namespace line needs to be removed for the backport.

   (EDIT: the patch that's being backported moved it lower from earlier in the file, but the previous pr that was backported has moved that same line earlier in the file. git just sees the original line being deleted in both patches, and considers it redundant and fine to omit, rather than marking it as a conflict)

   ---

   

   MarcoFalke commented at 5:27 AM on April 7, 2021:

   Correct. Fixed.

9. MarcoFalke force-pushed on Apr 7, 2021
10. ajtowns cross-referenced this on Apr 7, 2021 from issue Speedy trial support for versionbits by ajtowns
11. fanquake requested review from vasild on Apr 16, 2021
12. 
    vasild commented at 7:37 AM on April 16, 2021: contributor

    ACK 4546ac5af1c4105a0cf78a407fefcb189822bcf5

    I verified that the corresponding commits are same in master and in the backport (modulo mechanical diffs due to diverged code bases).

13. vasild approved
14. fanquake added the label Needs rebase on Apr 16, 2021
15. MarcoFalke removed this from the milestone 0.21.1 on Apr 16, 2021
16. MarcoFalke added this to the milestone 0.21.2 on Apr 16, 2021
17. 
    MarcoFalke commented at 9:15 AM on April 16, 2021: member

    Moved milestone due to lack of interest

18. 
    jnewbery commented at 9:19 AM on April 16, 2021: member

    ACK 4546ac5af1c4105a0cf78a407fefcb189822bcf5

    Verified cherrypick/rebase.

19. test: use pointers in denialofservice_tests/peer_discouragement

    This is a non-functional change that replaces the `CNode` on-stack
    variables with `CNode` pointers.
    
    The reason for this is that it would allow us to add those `CNode`s
    to `CConnman::vNodes[]` which in turn would allow us to check that they
    are disconnected properly - a `CNode` object must be in
    `CConnman::vNodes[]` in order for its `fDisconnect` flag to be set.
    
    If we store pointers to the on-stack variables in `CConnman` then it
    would crash at the end, trying to `delete` them.
    
    Github-Pull: #21571
    Rebased-From: 4d6e246fa46f2309e2998b542e4c104d73d29071

    dfeb6c10bb
20. test: also check disconnect in denialofservice_tests/peer_discouragement

    Use `CConnmanTest` instead of `CConnman` and add the nodes to it
    so that their `fDisconnect` flag is set during disconnection.
    
    Github-Pull: #21571
    Rebased-From: 637bb6da368b87711005b909f451f94909400092

    b765f41164
21. test: make sure non-IP peers get discouraged and disconnected

    Github-Pull: #21571
    Rebased-From: 81747b21719b3fa6b0fdfc3b084c0104d64903f9

    79cdb4a198
22. fuzz: cleanups for versionbits fuzzer

    Github-Pull: #21489
    Rebased-From: aa7f418fe32b3ec53285693a7731decd99be4528

    b8af67eeef
23. MarcoFalke force-pushed on Apr 16, 2021
24. 
    MarcoFalke commented at 9:22 AM on April 16, 2021: member

    Rebased

25. fanquake removed the label Needs rebase on Apr 16, 2021
26. 
    jnewbery commented at 9:28 AM on April 16, 2021: member

    ACK b8af67eeefc9fc9622f839ec8919b7391d91bf6f

    Verified rebase.

27. 
    ajtowns commented at 9:50 AM on April 16, 2021: contributor

    ACK b8af67eeefc9fc9622f839ec8919b7391d91bf6f ; visually compared individual commits to originals, checked original commits are in master

28. vasild approved
29. 
    vasild commented at 9:50 AM on April 16, 2021: contributor

    ACK b8af67eeefc9fc9622f839ec8919b7391d91bf6f

    Part of the last commit is already applied via b529222ad18f7facbaff394455875b4aa65d653e.

30. fanquake removed this from the milestone 0.21.2 on Apr 16, 2021
31. fanquake added this to the milestone 0.21.1 on Apr 16, 2021
32. fanquake merged this on Apr 16, 2021
33. fanquake closed this on Apr 16, 2021

    ---

34. MarcoFalke deleted the branch on Apr 17, 2021
35. bitcoin locked this on Aug 16, 2022

Contributors

MarcoFalkefanquakeajtownsvasildjnewbery

Milestone
0.21.1