Skip to content

Commit 3b3169d

Browse files
committed
Merge #6783: fix: resolve logical conflict between dash#6691 and dash#6775, compile error
0b8fe88 chore: resolve logical conflict between dash#6691 and dash#6775 (Kittywhiskers Van Gogh) Pull request description: ## Additional Information [dash#6691](#6691) and [dash#6775](#6775) were merged into `develop` in that order, neither conflicting with the other. [dash#6775](#6775) updated the UniValue subtree before it was unsubtree'd and subsequent improvements were backported. To enable this, a syntax change was required which replaced `get_int()` with `getInt<int>()`, which, the code introduced in [dash#6691](#6691) didn't use as it was merged _before_ [dash#6775](#6775). As it was new code, this was not registered as a merge conflict but this logical conflict caused `develop` to fail ([build](https://github.com/dashpay/dash/actions/runs/16546102266)). This pull request remedies that issue. ## 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 0b8fe88 knst: utACK 0b8fe88 Tree-SHA512: 7af4599e38bca5d776766cd8a2acda46d046f5dfe9f9c45586ac1f27fc709bd6ac913709b2c24d133ab57bbf2a6d5cb0630d0e874f62a472e173d61ced2face0
2 parents 94f0caa + 0b8fe88 commit 3b3169d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/test/llmq_commitment_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ BOOST_AUTO_TEST_CASE(commitment_json_test)
142142
BOOST_CHECK(json.exists("signersCount"));
143143
BOOST_CHECK(json.exists("validMembersCount"));
144144

145-
BOOST_CHECK_EQUAL(json["signersCount"].get_int(), commitment.CountSigners());
146-
BOOST_CHECK_EQUAL(json["validMembersCount"].get_int(), commitment.CountValidMembers());
145+
BOOST_CHECK_EQUAL(json["signersCount"].getInt<int>(), commitment.CountSigners());
146+
BOOST_CHECK_EQUAL(json["validMembersCount"].getInt<int>(), commitment.CountValidMembers());
147147
}
148148

149149
BOOST_AUTO_TEST_CASE(commitment_bitvector_json_test)

0 commit comments

Comments
 (0)