Peer state recalculation logic

Author: mikera

convex-core/src/main/java/convex/core/cvm/Peer.java

@@ -751,5 +751,9 @@ public long getHistoryPosition() {
 		return historyPosition;
 	}
 
+	public AVector<BlockResult> getBlockResults() {
+		return blockResults;
+	}
+
 
 }

convex-core/src/test/java/convex/core/cvm/PeerTest.java

@@ -18,6 +18,7 @@
 import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ACell;
 import convex.core.data.AMap;
+import convex.core.data.AVector;
 import convex.core.data.AccountKey;
 import convex.core.data.Keyword;
 import convex.core.data.ObjectsTest;
@@ -27,6 +28,7 @@
 import convex.core.util.FileUtils;
 import convex.core.util.Utils;
 import convex.core.cpos.Block;
+import convex.core.cpos.BlockResult;
 import convex.core.cpos.CPoSConstants;
 
 @TestInstance(Lifecycle.PER_CLASS)
@@ -129,7 +131,11 @@ private void doPeerTest(Peer pt) {
 
 		long sp=pt.getStatePosition();
 		long hp=pt.getHistoryPosition();
+		
 		assertTrue(sp>=hp);
+		
+		AVector<BlockResult> results=pt.getBlockResults();
+		assertEquals(sp-hp,results.count());
 	}
 
 	@Test

convex-peer/src/main/java/convex/peer/ConnectionManager.java

@@ -30,7 +30,6 @@
 import convex.core.data.AccountKey;
 import convex.core.data.Hash;
 import convex.core.data.Keyword;
-import convex.core.data.Maps;
 import convex.core.data.SignedData;
 import convex.core.data.Vectors;
 import convex.core.exceptions.BadFormatException;

convex-peer/src/test/java/convex/peer/ServerTest.java

@@ -30,7 +30,6 @@
 import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ACell;
 import convex.core.data.AMap;
-import convex.core.data.AVector;
 import convex.core.data.Hash;
 import convex.core.data.Keyword;
 import convex.core.data.Maps;