test: descriptor: fix test for MaxSatisfactionWeight #31570

1. 
   brunoerg commented at 5:23 pm on December 26, 2024: contributor

   To get the maximum size of a satisfaction for a descriptor with no max sig, the parameter use_max_sig should be false.
2. 
   DrahtBot commented at 5:23 pm on December 26, 2024: contributor

   The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

   Code Coverage & Benchmarks

   For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31570.

   Reviews

   See the guideline for information on the review process.

   Type	Reviewers
   ACK	tdb3, furszy, fjahr, achow101

   If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

3. DrahtBot added the label Tests on Dec 26, 2024
4. tdb3 approved
5. 
   tdb3 commented at 0:01 am on December 27, 2024: contributor

   ACK 00ec80b24ec32ac695d947587dd0f860fc6f1efa lgtm
6. in src/test/descriptor_tests.cpp:164 in 00ec80b24e outdated

   160@@ -161,7 +161,7 @@ void DoCheck(std::string prv, std::string pub, const std::string& norm_pub, int
   161     // We must be able to estimate the max satisfaction size for any solvable descriptor top descriptor (but combo).
   162     const bool is_nontop_or_nonsolvable{!parse_priv->IsSolvable() || !parse_priv->GetOutputType()};
   163     const auto max_sat_maxsig{parse_priv->MaxSatisfactionWeight(true)};
   164-    const auto max_sat_nonmaxsig{parse_priv->MaxSatisfactionWeight(true)};
   165+    const auto max_sat_nonmaxsig{parse_priv->MaxSatisfactionWeight(false)};
   

   ---

   ---

   

   furszy commented at 2:23 pm on December 27, 2024:

   Haven’t verified all the scenarios but maybe you could verify that max_sat_nonmaxsig < max_sat_maxsig (or <= if that causes any complication).

   ---

   

   brunoerg commented at 8:56 pm on December 27, 2024:

   Done.
7. test: descriptor: fix test for `MaxSatisfactionWeight`

   To get the maximum size of a satisfaction for a descriptor
   without considering the max sig, the parameter `use_max_sig`
   should be false.

   b29d68f942
8. brunoerg force-pushed on Dec 27, 2024
9. 
   brunoerg commented at 8:56 pm on December 27, 2024: contributor

   Force-pushed addressing #31570 (review)
10. tdb3 approved
11. 
    tdb3 commented at 5:22 pm on December 28, 2024: contributor

    re ACK b29d68f942e333d2cfdd6be8d49fe484e0d15e11
12. in src/test/descriptor_tests.cpp:165 in b29d68f942

    160@@ -161,7 +161,8 @@ void DoCheck(std::string prv, std::string pub, const std::string& norm_pub, int
    161     // We must be able to estimate the max satisfaction size for any solvable descriptor top descriptor (but combo).
    162     const bool is_nontop_or_nonsolvable{!parse_priv->IsSolvable() || !parse_priv->GetOutputType()};
    163     const auto max_sat_maxsig{parse_priv->MaxSatisfactionWeight(true)};
    164-    const auto max_sat_nonmaxsig{parse_priv->MaxSatisfactionWeight(true)};
    165+    const auto max_sat_nonmaxsig{parse_priv->MaxSatisfactionWeight(false)};
    166+    BOOST_CHECK(max_sat_nonmaxsig <= max_sat_maxsig);
    

    ---

    ---

    

    furszy commented at 2:38 pm on December 30, 2024:

    nit: could use BOOST_CHECK_LE.
13. 
    furszy commented at 2:38 pm on December 30, 2024: member

    utACK b29d68f942e
14. 
    fjahr commented at 4:20 pm on December 30, 2024: contributor

    utACK b29d68f942e333d2cfdd6be8d49fe484e0d15e11

    Nice catch!

15. 
    achow101 commented at 7:27 pm on December 30, 2024: member

    ACK b29d68f942e333d2cfdd6be8d49fe484e0d15e11
16. achow101 merged this on Dec 30, 2024
17. achow101 closed this on Dec 30, 2024

    ---

Contributors
brunoerg DrahtBot tdb3 furszy fjahr achow101

Labels
Tests