Merge pull request #50 from input-output-hk/2.1.2

2.1.2
input-output-hk · Jun 17, 2018 · aaabfa9 · aaabfa9
2 parents 299e642 + dbb4392
commit aaabfa9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ resolvers += "Sonatype Releases" at "https://oss.sonatype.org/content/repositori
 
 You can use Scrypto in your sbt project by simply adding the following dependency to your build file:
 ```scala
-libraryDependencies += "org.scorexfoundation" %% "scrypto" % "2.1.1"
+libraryDependencies += "org.scorexfoundation" %% "scrypto" % "2.1.2"
 ```
 
 ### Hash functions

diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ name := "scrypto"
 
 lazy val commonSettings = Seq(
   organization := "org.scorexfoundation",
-  version := "2.1.1",
+  version := "2.1.2",
   scalaVersion := "2.12.5",
   licenses := Seq("CC0" -> url("https://creativecommons.org/publicdomain/zero/1.0/legalcode")),
   homepage := Some(url("https://github.com/input-output-hk/scrypto")),

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,11 @@
+**2.1.2**
+---------
+
+* Base58: empty string allowed as parameter
+* Reworked Base16 implementation has much better performance
+* Minor changes in MerkleTree implementation 
+
+
 **2.1.1**
 ---------
 

diff --git a/src/test/scala/scorex/crypto/authds/avltree/batch/BatchingPlayground.scala b/src/test/scala/scorex/crypto/authds/avltree/batch/BatchingPlayground.scala
@@ -36,7 +36,9 @@ object BatchingPlayground extends App with BatchTestingHelpers with Matchers {
   //lookupBenchmark()
   //  testReadme
   //removedNodesBenchmark
-  removedNodesBenchmark()
+  //removedNodesBenchmark()
+
+  testReadme
 
   def removedNodesBenchmark(startTreeSize: Int = 10000,
                             toRemoveSize: Int = 2000,