after-init fixes

Author: kushti

README.md

@@ -6,5 +6,7 @@ our hardware in the paper .
 
 ## Benchmarks List
 
-
+* Performance Benchmark
+* Batching Benchmark
+* Blockchain Processing Simulation Benchmark
 

src/main/scala/benchmarks/BatchingBenchmark.scala

@@ -1,10 +1,11 @@
 package scorex.crypto.authds.benchmarks
 
-import scorex.crypto.authds.TwoPartyTests
+import benchmarks.helpers._
 import scorex.crypto.authds.avltree.batch._
 import scorex.crypto.authds.avltree.legacy.{AVLModifyProof, AVLTree}
 import scorex.utils.Random
 import scorex.crypto.authds.avltree._
+
 import scala.util.Success
 
 /**
@@ -13,10 +14,10 @@ import scala.util.Success
 object BatchingBenchmark extends App with TwoPartyTests {
 
  println ("treeSize, numLookups, proofSizeForEach")
- benchSizeLookupsInTree(1000000, Seq(1000), false, false)
- benchSizeLookupsInTree(1000000, Seq(1000), true, false)
- benchSizeLookupsInTree(1000000, Seq(1000), false, true)
- benchSizeLookupsInTree(1000000, Seq(1000), true, true)
+ benchSizeLookupsInTree(1000000, Seq(1000), useFreshLookups = false, halfInserts = false)
+ benchSizeLookupsInTree(1000000, Seq(1000), useFreshLookups = true, halfInserts = false)
+ benchSizeLookupsInTree(1000000, Seq(1000), useFreshLookups = false, halfInserts = true)
+ benchSizeLookupsInTree(1000000, Seq(1000), useFreshLookups = true, halfInserts = true)
 
  bench2()
 // timeBenchmarksNewContinuous

src/main/scala/benchmarks/BlockchainBench.scala

@@ -1,6 +1,7 @@
 
 package scorex.crypto.authds.benchmarks
 
+/*
 import com.google.common.primitives.Ints
 import org.mapdb.DB.TreeMapMaker
 import org.mapdb.{BTreeMap, DBMaker, Serializer}
@@ -27,6 +28,7 @@ trait BenchmarkCommons {
  val perBlock = additionsInBlock + modificationsInBlock
 }
 
+
 trait TwoPartyCommons extends BenchmarkCommons with UpdateF[TreapValue] {
  lazy val db = DBMaker
  .fileDB("/tmp/proofs")
@@ -363,4 +365,4 @@ object BlockchainBench extends BenchmarkLaunchers with App {
  runBatchProver()
  //runBatchVerifier()
 }
-
+*/

src/main/scala/benchmarks/PerformanceMeter.scala

@@ -1,8 +1,8 @@
 package scorex.crypto.authds.benchmarks
 
+import benchmarks.helpers.TwoPartyTests
 import scorex.crypto.authds.avltree.legacy.AVLTree
 import scorex.crypto.authds.legacy.treap._
-import scorex.crypto.authds.TwoPartyTests
 import scorex.crypto.hash.Blake2b256Unsafe
 
 

src/main/scala/benchmarks/helpers/BatchTesting.scala

@@ -1,8 +1,9 @@
-package scorex.crypto.authds.avltree.batch
+package benchmarks.helpers
 
 import scorex.crypto.authds.TwoPartyDictionary.Label
 import scorex.crypto.authds.UpdateF
 import scorex.crypto.authds.avltree._
+import scorex.crypto.authds.avltree.batch.Modification
 import scorex.crypto.authds.avltree.legacy.{AVLModifyProof, AVLTree}
 
 import scala.collection.mutable.ArrayBuffer

src/main/scala/benchmarks/helpers/Gzip.scala

@@ -1,4 +1,4 @@
-package scorex.crypto.authds.benchmarks
+package benchmarks.helpers
 
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
 import java.util.zip.{GZIPInputStream, GZIPOutputStream}

src/main/scala/benchmarks/helpers/TestingCommons.scala

@@ -1,4 +1,4 @@
-package scorex.crypto
+package benchmarks.helpers
 
 import java.io.File
 

src/main/scala/benchmarks/helpers/TwoPartyTests.scala

@@ -1,8 +1,8 @@
-package scorex.crypto.authds
+package benchmarks.helpers
 
 import com.google.common.primitives.Longs
-import scorex.crypto.TestingCommons
 import scorex.crypto.authds.TwoPartyDictionary.Label
+import scorex.crypto.authds._
 import scorex.crypto.authds.avltree.AVLValue
 import scorex.crypto.authds.legacy.treap.Constants.TreapValue
 import scorex.crypto.hash.Sha256