From 225ffed5da1a241a88da5d9d9ab327911af5d8f7 Mon Sep 17 00:00:00 2001 From: Brannon King Date: Wed, 8 Jan 2020 16:12:06 -0700 Subject: [PATCH] use original height for seq parameter in RPC --- src/rpc/claimtrie.cpp | 4 +--- src/test/claimtrierpc_tests.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/rpc/claimtrie.cpp b/src/rpc/claimtrie.cpp index 835bbc873..240b9626a 100644 --- a/src/rpc/claimtrie.cpp +++ b/src/rpc/claimtrie.cpp @@ -124,9 +124,7 @@ std::vector seqSort(const std::vector& 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; diff --git a/src/test/claimtrierpc_tests.cpp b/src/test/claimtrierpc_tests.cpp index 4487dffc1..10631a5b6 100644 --- a/src/test/claimtrierpc_tests.cpp +++ b/src/test/claimtrierpc_tests.cpp @@ -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;