LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Use fully static linkage #364

Closed
bvbfan wants to merge 78 commits from static_link into master
pull from: static_link
merge into: LBRYCommunity:master
Conversation 2 Commits 78 Files changed 312 +3 -5
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 225ffed5da - Show all commits

4
src/rpc/claimtrie.cpp
View file

@ -124,9 +124,7 @@ std::vector<CClaimNsupports> seqSort(const std::vector<CClaimNsupports>& source)
auto claimsNsupports = source;
std::sort(claimsNsupports.begin(), claimsNsupports.end(), [](const CClaimNsupports& lhs, const CClaimNsupports& rhs) {
auto& lc = lhs.claim;
auto& rc = rhs.claim;
return lc.nHeight < rc.nHeight || (lc.nHeight == rc.nHeight && lc.outPoint.n < rc.outPoint.n);
return lhs.originalHeight < rhs.originalHeight || (lhs.originalHeight == rhs.originalHeight && lhs.claim < rhs.claim);
});
return claimsNsupports;

4
src/test/claimtrierpc_tests.cpp
View file

@ -238,8 +238,8 @@ BOOST_AUTO_TEST_CASE(hash_bid_seq_claim_changes_test)
auto claimId4 = ClaimIdHash(tx3.GetHash(), 0);
int claim1bid = 3, claim1seq = 0;
int claim2bid = 1, claim2seq = 1;
int claim3bid = 2, claim3seq = 2;
int claim2bid = 1, claim2seq = 2;
int claim3bid = 2, claim3seq = 1;
int claim4bid = 0, claim4seq = 3;
auto getclaimsforname = tableRPC["getclaimsforname"]->actor;