Skip to content

Commit 9b97522

Browse files
committed
Merge bitcoin/bitcoin#31570: test: descriptor: fix test for MaxSatisfactionWeight
b29d68f test: descriptor: fix test for `MaxSatisfactionWeight` (brunoerg) Pull request description: To get the maximum size of a satisfaction for a descriptor with no max sig, the parameter `use_max_sig` should be false. ACKs for top commit: fjahr: utACK b29d68f achow101: ACK b29d68f tdb3: re ACK b29d68f furszy: utACK b29d68f Tree-SHA512: 8559718d126e60ce21a34183f74d227546108b43e3897e49622d6677ed9e7707caa962fd811d8787bd4dafc48a0e779ef11050d5990293faa2f91ded4aaa4f4b
2 parents 87c9ebd + b29d68f commit 9b97522

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/test/descriptor_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ void DoCheck(std::string prv, std::string pub, const std::string& norm_pub, int
161161
// We must be able to estimate the max satisfaction size for any solvable descriptor top descriptor (but combo).
162162
const bool is_nontop_or_nonsolvable{!parse_priv->IsSolvable() || !parse_priv->GetOutputType()};
163163
const auto max_sat_maxsig{parse_priv->MaxSatisfactionWeight(true)};
164-
const auto max_sat_nonmaxsig{parse_priv->MaxSatisfactionWeight(true)};
164+
const auto max_sat_nonmaxsig{parse_priv->MaxSatisfactionWeight(false)};
165+
BOOST_CHECK(max_sat_nonmaxsig <= max_sat_maxsig);
165166
const auto max_elems{parse_priv->MaxSatisfactionElems()};
166167
const bool is_input_size_info_set{max_sat_maxsig && max_sat_nonmaxsig && max_elems};
167168
BOOST_CHECK_MESSAGE(is_input_size_info_set || is_nontop_or_nonsolvable, prv);

0 commit comments

Comments
 (0)