Ignore size of proof in results data. Don't allow client to set highe…

…r max results.
snowblossomcoin · Aug 22, 2018 · 2117bbc · 2117bbc
1 parent 554c7a0
commit 2117bbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/src/trie/HashedTrie.java b/lib/src/trie/HashedTrie.java
@@ -131,7 +131,7 @@ public void getNodeDetails(ByteString hash, ByteString target_key, LinkedList<Tr
     {
       results.add(node);
     }
-    if (results.size() + proof.size() >= max_results) return;
+    if (results.size() >= max_results) return;
 
 
     for(ChildEntry ce : node.getChildrenList())

diff --git a/node/src/SnowUserService.java b/node/src/SnowUserService.java
@@ -182,7 +182,7 @@ public void getUTXONode(GetUTXONodeRequest request, StreamObserver<GetUTXONodeRe
     LinkedList<TrieNode> proof = new LinkedList<>();
     LinkedList<TrieNode> results = new LinkedList<>();
     int max_results = 10000;
-    if (request.getMaxResults() > 0) max_results = request.getMaxResults();
+    if (request.getMaxResults() > 0) max_results = Math.min(max_results, request.getMaxResults());
 
 
     node.getUtxoHashedTrie().getNodeDetails(utxo_root.getBytes(), target, proof, results, max_results);