More changes

ergoplatform · Mar 14, 2024 · 217f130 · 217f130
1 parent 0ed2f7d
commit 217f130
Show file tree

Hide file tree

Showing 32 changed files with 177 additions and 154 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,3 +1,4 @@
 version = "3.8.0"
+runner.dialect = scala213
 style = defaultWithAlign
-maxColumn = 200
+align.preset = more
diff --git a/build.sbt b/build.sbt
@@ -16,7 +16,7 @@ libraryDependencies ++= Seq(
   "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
   "org.ergoplatform" %% "ergo-appkit" % "5.0.4",
   "com.squareup.okhttp3" % "mockwebserver" % "4.12.0",
-  "org.scalatest" %% "scalatest" % "3.2.18",
+  "org.scalatest" %% "scalatest" % "3.2.18" % Test,
   "org.scalatestplus" %% "scalacheck-1-17" % "3.2.18.0" % Test,
   "org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
   "org.mockito" % "mockito-core" % "5.11.0" % Test

diff --git a/src/main/java/org/ergoplatform/kiosk/appkit/FileMockedErgoClient.java b/src/main/java/org/ergoplatform/kiosk/appkit/FileMockedErgoClient.java
@@ -121,28 +121,16 @@ public BlockchainDataSource getDataSource() {
     public <T> T execute(Function<BlockchainContext, T> action) {
         BlockchainContext ctx =
                 new BlockchainContextBuilderImpl(_dataSource, NetworkType.MAINNET).build();
-
         T res = action.apply(ctx);
 
-        return res;
-    }
-
-    public void start() {
         try {
-            _node.start();
-            _explorer.start();
-        } catch (IOException e) {
-            throw new ErgoClientException("Cannot start server " + _node.toString(), e);
-        }
-    }
-
-    public void stop() {
-        try {
-            _explorer.shutdown();
-            _node.shutdown();
+            _explorer.close();
+            _node.close();
         } catch (IOException e) {
             throw new ErgoClientException("Cannot shutdown server " + _node.toString(), e);
         }
+
+        return res;
     }
 }
 
diff --git a/src/main/scala/org/ergoplatform/kiosk/appkit/MockErgoClient.scala b/src/main/scala/org/ergoplatform/kiosk/appkit/MockErgoClient.scala
diff --git a/src/test/scala/org/ergoplatform/kiosk/multisecret/MultiProveDlogSpec.scala b/src/test/scala/org/ergoplatform/kiosk/multisecret/MultiProveDlogSpec.scala
@@ -2,13 +2,15 @@ package org.ergoplatform.kiosk.multisecret
 
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
-import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder,InputBox}
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox}
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import sigmastate.eval._
 import sigma.GroupElement
 import sigmastate.crypto.CryptoConstants
 
-class MultiProveDlogSpec extends MockErgoClient {
+class MultiProveDlogSpec extends AnyPropSpec with Matchers {
 
   val changeAddress = "9f5ZKbECVTm25JTRQHDHGM5ehC8tUw5g1fCBQ4aaE792rWBFrjK"
   val dummyTxId1 = "d9e5ce5aa0d95f5d54a7bc89c46730d9662397067250aa18a0039631c0f5b809"
@@ -22,8 +24,8 @@ class MultiProveDlogSpec extends MockErgoClient {
   private val gX: GroupElement = defaultGenerator.exp(secret1.bigInteger)
   private val gY: GroupElement = defaultGenerator.exp(secret2.bigInteger)
 
-  property("Multi proveDlog") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Multi proveDlog") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val fee = 1500000
       val contract1 = ctx.compileContract(
         ConstantsBuilder

diff --git a/src/test/scala/org/ergoplatform/kiosk/nonlazy/BranchSpec.scala b/src/test/scala/org/ergoplatform/kiosk/nonlazy/BranchSpec.scala
@@ -4,18 +4,20 @@ import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt,
 import Branch.branchBoxAddress
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, SignedTransaction}
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 
 import scala.util.Try
 
-class BranchSpec extends MockErgoClient {
+class BranchSpec extends AnyPropSpec with Matchers {
 
   val changeAddress = "9f5ZKbECVTm25JTRQHDHGM5ehC8tUw5g1fCBQ4aaE792rWBFrjK"
   val dummyTxId = "f9e5ce5aa0d95f5d54a7bc89c46730d9662397067250aa18a0039631c0f5b809"
   val dummyScript = "{sigmaProp(1 < 2)}"
 
-  property("Not-so-lazy evaluation") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Not-so-lazy evaluation") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       assert(branchBoxAddress == "88dwYDNXcCq9UyA7VBcSdqJRgooKVqS8ixprCknxcm2sba4jbhQYGphjutEebtr3ZeC4tmT9oEWKS2Bq")
 
       val fee = 1500000

diff --git a/src/test/scala/org/ergoplatform/kiosk/nonlazy/SplitSpec.scala b/src/test/scala/org/ergoplatform/kiosk/nonlazy/SplitSpec.scala
@@ -4,15 +4,17 @@ import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt,
 import Split.splitAddress
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
-class SplitSpec extends MockErgoClient {
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
+class SplitSpec extends AnyPropSpec with Matchers {
 
   val changeAddress = "9f5ZKbECVTm25JTRQHDHGM5ehC8tUw5g1fCBQ4aaE792rWBFrjK"
   val dummyTxId = "f9e5ce5aa0d95f5d54a7bc89c46730d9662397067250aa18a0039631c0f5b809"
   val dummyScript = "{sigmaProp(1 < 2)}"
 
-  property("Not-so-lazy evaluation") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Not-so-lazy evaluation") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       assert(
         splitAddress == "2PELCgrp5nNgVKMAEky7GjT8VxL7Xsc7z7ocVcEW4e1zhKSrzwVSavg3C4AbbN2xM4vRSFQv4EVDarTChJnwg6wwEURFj5VjMv7nVpAm8jaahzZZoJJqJRHaEu2zteSzMXsYBHGsQDD5m5JPsp3hkZ8qzXcgBd29TzTfEqh9i8FnFe3X")
 

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala
@@ -4,14 +4,16 @@ import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit.impl.ErgoTreeContract
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 
-class OraclePoolFundingSpec extends MockErgoClient {
+class OraclePoolFundingSpec extends AnyPropSpec with Matchers {
 
 
-  property("Fund collection") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Fund collection") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePool {
         val minBoxValue = 2000000
         override lazy val livePeriod = 4 // blocks

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolSpec.scala
@@ -5,14 +5,16 @@ import org.ergoplatform.kiosk.encoding.ScalaErgoConverters
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.propspec.AnyPropSpec
 
-class OraclePoolSpec extends MockErgoClient {
-  property("One complete epoch") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+class OraclePoolSpec extends AnyPropSpec with Matchers {
+  property("One complete epoch") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePool {
         val minBoxValue = 2000000
         override lazy val livePeriod = 4 // blocks

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala
@@ -4,12 +4,14 @@ import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.appkit.impl.ErgoTreeContract
 import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox}
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.{createMockedErgoClient, networkType}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 
-class OraclePoolFundingSpec extends MockErgoClient {
-  property("Fund collection") { ergo =>
-      ergo.client.execute { implicit ctx: BlockchainContext =>
+class OraclePoolFundingSpec extends AnyPropSpec with Matchers {
+  property("Fund collection") {
+      createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePool {
         val minBoxValue = 2000000
         override lazy val livePeriod = 4 // blocks
@@ -64,7 +66,7 @@ class OraclePoolFundingSpec extends MockErgoClient {
           r4epochPrep.getErgoValue,
           r5epochPrep.getErgoValue
         )
-        .contract(new ErgoTreeContract(pool.epochPrepErgoTree, _networkType))
+        .contract(new ErgoTreeContract(pool.epochPrepErgoTree, networkType))
         .build()
         .convertToInputWith(dummyTxId1, 0)
 

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolSpec.scala
@@ -5,14 +5,16 @@ import org.ergoplatform.kiosk.encoding.ScalaErgoConverters
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, SignedTransaction}
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 import scorex.crypto.hash.Blake2b256
 
-class OraclePoolSpec extends MockErgoClient {
+class OraclePoolSpec extends AnyPropSpec with Matchers {
 
-  property("One complete epoch") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("One complete epoch") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePool {
         val minBoxValue = 2000000
         override lazy val livePeriod = 4 // blocks

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala
@@ -4,14 +4,16 @@ import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit.impl.ErgoTreeContract
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 
-class OraclePoolFundingSpec extends MockErgoClient {
+class OraclePoolFundingSpec extends AnyPropSpec with Matchers {
 
 
-  property("Fund collection") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Fund collection") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePool {
         val minBoxValue = 2000000
         override lazy val livePeriod = 4 // blocks

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolSpec.scala
@@ -5,15 +5,17 @@ import org.ergoplatform.kiosk.encoding.ScalaErgoConverters
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 import scorex.crypto.hash.Blake2b256
 
-class OraclePoolSpec extends MockErgoClient {
+class OraclePoolSpec extends AnyPropSpec with Matchers {
 
 
-  property("One complete epoch") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("One complete epoch") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePool {
         val minBoxValue = 2000000
         override lazy val livePeriod = 4 // blocks

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala
@@ -4,14 +4,16 @@ import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.appkit._
 import org.ergoplatform.appkit.impl.ErgoTreeContract
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 
-class OraclePoolLiveFundingSpec extends MockErgoClient {
+class OraclePoolLiveFundingSpec extends AnyPropSpec with Matchers {
 
 
-  property("Fund collection") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Fund collection") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePoolLive {
         lazy val addresses = Seq(
           "9eiuh5bJtw9oWDVcfJnwTm1EHfK5949MEm5DStc2sD1TLwDSrpx", // private key is 37cc5cb5b54f98f92faef749a53b5ce4e9921890d9fb902b4456957d50791bd0

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala
@@ -5,14 +5,16 @@ import org.ergoplatform.kiosk.encoding.ScalaErgoConverters
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 import scorex.crypto.hash.Blake2b256
 
-class OraclePoolLiveSpec extends MockErgoClient {
+class OraclePoolLiveSpec extends AnyPropSpec with Matchers {
 
-  property("One complete epoch") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("One complete epoch") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePoolLive {
         lazy val addresses = Seq(
           "9eiuh5bJtw9oWDVcfJnwTm1EHfK5949MEm5DStc2sD1TLwDSrpx", // private key is 37cc5cb5b54f98f92faef749a53b5ce4e9921890d9fb902b4456957d50791bd0

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala
@@ -4,14 +4,16 @@ import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.appkit._
 import org.ergoplatform.appkit.impl.ErgoTreeContract
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 
-class OraclePoolLiveFundingSpec extends MockErgoClient {
+class OraclePoolLiveFundingSpec extends AnyPropSpec with Matchers {
 
 
-  property("Fund collection") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Fund collection") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePoolLive {
         lazy val addresses = Seq(
           "9eiuh5bJtw9oWDVcfJnwTm1EHfK5949MEm5DStc2sD1TLwDSrpx", // private key is 37cc5cb5b54f98f92faef749a53b5ce4e9921890d9fb902b4456957d50791bd0

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala
@@ -5,14 +5,16 @@ import org.ergoplatform.kiosk.encoding.ScalaErgoConverters
 import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit._
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 import scorex.crypto.hash.Blake2b256
 
-class OraclePoolLiveSpec extends MockErgoClient {
+class OraclePoolLiveSpec extends AnyPropSpec with Matchers {
 
-  property("One complete epoch") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("One complete epoch") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePoolLive {
         lazy val addresses = Seq(
           "9eiuh5bJtw9oWDVcfJnwTm1EHfK5949MEm5DStc2sD1TLwDSrpx", // private key is 37cc5cb5b54f98f92faef749a53b5ce4e9921890d9fb902b4456957d50791bd0

diff --git a/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala
@@ -4,14 +4,16 @@ import org.ergoplatform.kiosk.ergo._
 import org.ergoplatform.kiosk.tx.TxUtil
 import org.ergoplatform.appkit._
 import org.ergoplatform.appkit.impl.ErgoTreeContract
-import org.ergoplatform.kiosk.appkit.MockErgoClient
+import org.ergoplatform.kiosk.appkit.HttpClientTesting.createMockedErgoClient
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.propspec.AnyPropSpec
 import org.ergoplatform.sdk.ErgoToken
 
-class OraclePoolLiveFundingSpec extends MockErgoClient {
+class OraclePoolLiveFundingSpec extends AnyPropSpec with Matchers {
 
 
-  property("Fund collection") { ergo =>
-    ergo.client.execute { implicit ctx: BlockchainContext =>
+  property("Fund collection") {
+    createMockedErgoClient().execute { implicit ctx: BlockchainContext =>
       val pool = new OraclePoolLive {
         lazy val addresses = Seq(
           "9eiuh5bJtw9oWDVcfJnwTm1EHfK5949MEm5DStc2sD1TLwDSrpx", // private key is 37cc5cb5b54f98f92faef749a53b5ce4e9921890d9fb902b4456957d50791bd0