From 8c807768c9dd219c7c1edf039e76c3c4a1e4e163 Mon Sep 17 00:00:00 2001 From: ccellado Date: Sat, 9 Mar 2024 16:59:06 +0400 Subject: [PATCH] More changes --- build.sbt | 23 +++++++++++++++---- .../kiosk}/appkit/FileMockedErgoClient.java | 3 ++- .../kiosk}/appkit/MockedErgoClient.java | 4 +++- src/main/scala/kiosk/offchain/readme.md | 5 ---- .../ergoplatform}/kiosk/ErgoUtil.scala | 8 +++---- .../ergoplatform}/kiosk/appkit/Client.scala | 2 +- .../kiosk}/appkit/HttpClientTesting.scala | 7 ++++-- .../kiosk}/appkit/MockErgoClient.scala | 10 ++++---- .../ergoplatform}/kiosk/appkit/Nodes.scala | 2 +- .../kiosk/encoding/ScalaErgoConverters.scala | 6 ++--- .../ergoplatform}/kiosk/ergo/DataType.scala | 4 ++-- .../ergoplatform}/kiosk/ergo/package.scala | 4 ++-- .../ergoplatform}/kiosk/explorer/Curl.scala | 2 +- .../kiosk/explorer/Explorer.scala | 10 ++++---- .../kiosk/script/ScriptUtil.scala | 8 +++---- .../ergoplatform}/kiosk/tx/TxUtil.scala | 6 ++--- src/test/scala/kiosk/offchain/readme.md | 7 ------ src/test/scala/kiosk/offchain/timestamp.json | 1 - .../kiosk/ergo/Auction.scala | 2 +- .../kiosk/ergo/AuctionSpec.scala | 12 ++++------ .../kiosk/ergo/ErgoMix.scala | 2 +- .../kiosk/ergo/ErgoMixSpec.scala | 10 ++++---- .../kiosk/ergo/InterestFreeLoan.scala | 2 +- .../kiosk/ergo/InterestFreeLoanSpec.scala | 15 +++++------- .../kiosk/ergo/OneWayUSDToken.scala | 10 +------- .../kiosk/ergo/OneWayUSDTokenSpec.scala | 15 +++++------- .../kiosk/ergo/YieldProtocol.scala | 10 +------- .../kiosk/ergo/YieldProtocolSpec.scala | 15 ++++++------ .../kiosk/explorer/ExplorerTest.scala | 2 +- .../multisecret/MultiProveDlogSpec.scala | 11 ++++----- .../ergoplatform}/kiosk/nonlazy/Branch.scala | 6 ++--- .../kiosk/nonlazy/BranchSpec.scala | 16 ++++++------- .../ergoplatform}/kiosk/nonlazy/Split.scala | 8 +++---- .../kiosk/nonlazy/SplitSpec.scala | 11 ++++----- .../kiosk/oraclepool/v1/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v1/OraclePoolDemo.scala | 4 ++-- .../oraclepool/v1/OraclePoolFundingSpec.scala | 9 ++++---- .../kiosk/oraclepool/v1/OraclePoolSpec.scala | 13 +++++------ .../kiosk/oraclepool/v2/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v2/OraclePoolDemo.scala | 4 ++-- .../oraclepool/v2/OraclePoolFundingSpec.scala | 9 ++++---- .../kiosk/oraclepool/v2/OraclePoolSpec.scala | 17 +++++++------- .../kiosk/oraclepool/v2/readme.md | 0 .../kiosk/oraclepool/v3/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v3/OraclePoolDemo.scala | 4 ++-- .../oraclepool/v3/OraclePoolFundingSpec.scala | 9 ++++---- .../kiosk/oraclepool/v3/OraclePoolSpec.scala | 13 +++++------ .../kiosk/oraclepool/v3/readme.md | 0 .../kiosk/oraclepool/v4a}/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v4a/OraclePoolLive.scala | 4 ++-- .../v4a/OraclePoolLiveAddressSpec.scala | 4 ++-- .../v4a}/OraclePoolLiveFundingSpec.scala | 9 ++++---- .../oraclepool/v4a/OraclePoolLiveSpec.scala | 13 +++++------ .../kiosk/oraclepool/v4a/readme.md | 0 .../kiosk/oraclepool/v4b}/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v4b/OraclePoolLive.scala | 4 ++-- .../v4b/OraclePoolLiveAddressSpec.scala | 4 ++-- .../v4b}/OraclePoolLiveFundingSpec.scala | 9 +++++--- .../oraclepool/v4b/OraclePoolLiveSpec.scala | 13 +++++------ .../kiosk/oraclepool/v4b/readme.md | 0 .../kiosk/oraclepool/v5}/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v5/OraclePoolLive.scala | 4 ++-- .../v5/OraclePoolLiveAddressSpec.scala | 4 ++-- .../v5}/OraclePoolLiveFundingSpec.scala | 10 ++++---- .../oraclepool/v5/OraclePoolLiveSpec.scala | 13 +++++------ .../kiosk/oraclepool/v5/UpdateSpec.scala | 11 ++++----- .../kiosk/oraclepool/v5/VotingSpec.scala | 11 ++++----- .../kiosk/oraclepool/v5/readme.md | 0 .../kiosk/oraclepool/v6}/OraclePool.scala | 10 ++++---- .../kiosk/oraclepool/v6/OraclePoolLive.scala | 4 ++-- .../v6/OraclePoolLiveAddressSpec.scala | 4 ++-- .../v6}/OraclePoolLiveFundingSpec.scala | 11 ++++----- .../oraclepool/v6/OraclePoolLiveSpec.scala | 13 +++++------ .../kiosk/oraclepool/v6/UpdateSpec.scala | 11 ++++----- .../kiosk/oraclepool/v6/VotingSpec.scala | 11 ++++----- .../kiosk/oraclepool/v6/readme.md | 0 .../kiosk/oraclepool/v7/AddressSpec.scala | 4 ++-- .../kiosk/oraclepool/v7/Contracts.scala | 12 +++++----- .../kiosk/oraclepool/v7/FundingSpec.scala | 7 +++--- .../oraclepool/v7/OraclePoolParams.scala | 2 +- .../kiosk/oraclepool/v7/OraclePoolSpec.scala | 13 +++++------ .../v7/RecoverLiveEpochBoxSpec.scala | 15 ++++++------ .../kiosk/oraclepool/v7/UpdateSpec.scala | 11 ++++----- .../kiosk/oraclepool/v7/VotingSpec.scala | 11 ++++----- .../kiosk/oraclepool/v7/readme.md | 0 .../kiosk/script/ScriptSpec.scala | 10 ++++---- .../kiosk/timestamp/v1/Timestamp.scala | 8 +++---- .../kiosk/timestamp/v1}/TimestampSpec.scala | 9 ++++---- .../kiosk/timestamp/v2/Timestamp.scala | 8 +++---- .../kiosk/timestamp/v2}/TimestampSpec.scala | 9 ++++---- .../kiosk/timestamp/v2/readme.md | 0 91 files changed, 329 insertions(+), 368 deletions(-) rename src/{test/java/org/ergoplatform => main/java/org/ergoplatform/kiosk}/appkit/FileMockedErgoClient.java (98%) rename src/{test/java/org/ergoplatform => main/java/org/ergoplatform/kiosk}/appkit/MockedErgoClient.java (89%) delete mode 100644 src/main/scala/kiosk/offchain/readme.md rename src/main/scala/{ => org/ergoplatform}/kiosk/ErgoUtil.scala (90%) rename src/main/scala/{ => org/ergoplatform}/kiosk/appkit/Client.scala (95%) rename src/{test/scala/org/ergoplatform => main/scala/org/ergoplatform/kiosk}/appkit/HttpClientTesting.scala (86%) rename src/{test/scala/org/ergoplatform => main/scala/org/ergoplatform/kiosk}/appkit/MockErgoClient.scala (51%) rename src/main/scala/{ => org/ergoplatform}/kiosk/appkit/Nodes.scala (79%) rename src/main/scala/{ => org/ergoplatform}/kiosk/encoding/ScalaErgoConverters.scala (94%) rename src/main/scala/{ => org/ergoplatform}/kiosk/ergo/DataType.scala (93%) rename src/main/scala/{ => org/ergoplatform}/kiosk/ergo/package.scala (98%) rename src/main/scala/{ => org/ergoplatform}/kiosk/explorer/Curl.scala (98%) rename src/main/scala/{ => org/ergoplatform}/kiosk/explorer/Explorer.scala (84%) rename src/main/scala/{ => org/ergoplatform}/kiosk/script/ScriptUtil.scala (92%) rename src/main/scala/{ => org/ergoplatform}/kiosk/tx/TxUtil.scala (92%) delete mode 100644 src/test/scala/kiosk/offchain/readme.md delete mode 100644 src/test/scala/kiosk/offchain/timestamp.json rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/Auction.scala (97%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/AuctionSpec.scala (89%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/ErgoMix.scala (97%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/ErgoMixSpec.scala (94%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/InterestFreeLoan.scala (99%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/InterestFreeLoanSpec.scala (95%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/OneWayUSDToken.scala (89%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/OneWayUSDTokenSpec.scala (90%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/YieldProtocol.scala (92%) rename src/test/scala/org/{sh => ergoplatform}/kiosk/ergo/YieldProtocolSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/explorer/ExplorerTest.scala (99%) rename src/test/scala/{ => org/ergoplatform}/kiosk/multisecret/MultiProveDlogSpec.scala (91%) rename src/test/scala/{ => org/ergoplatform}/kiosk/nonlazy/Branch.scala (72%) rename src/test/scala/{ => org/ergoplatform}/kiosk/nonlazy/BranchSpec.scala (89%) rename src/test/scala/{ => org/ergoplatform}/kiosk/nonlazy/Split.scala (85%) rename src/test/scala/{ => org/ergoplatform}/kiosk/nonlazy/SplitSpec.scala (93%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v1/OraclePool.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v1/OraclePoolDemo.scala (98%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v1/OraclePoolSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v2/OraclePool.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v2/OraclePoolDemo.scala (98%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v2/OraclePoolSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v2/readme.md (100%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v3/OraclePool.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v3/OraclePoolDemo.scala (98%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v3/OraclePoolSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v3/readme.md (100%) rename src/test/scala/{kiosk/oraclepool/v4b => org/ergoplatform/kiosk/oraclepool/v4a}/OraclePool.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4a/OraclePoolLive.scala (92%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala (97%) rename src/test/scala/{kiosk/oraclepool/v5 => org/ergoplatform/kiosk/oraclepool/v4a}/OraclePoolLiveFundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4a/readme.md (100%) rename src/test/scala/{kiosk/oraclepool/v4a => org/ergoplatform/kiosk/oraclepool/v4b}/OraclePool.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4b/OraclePoolLive.scala (93%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala (97%) rename src/test/scala/{kiosk/oraclepool/v6 => org/ergoplatform/kiosk/oraclepool/v4b}/OraclePoolLiveFundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v4b/readme.md (100%) rename src/test/scala/{kiosk/oraclepool/v6 => org/ergoplatform/kiosk/oraclepool/v5}/OraclePool.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v5/OraclePoolLive.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala (98%) rename src/test/scala/{kiosk/oraclepool/v4a => org/ergoplatform/kiosk/oraclepool/v5}/OraclePoolLiveFundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v5/UpdateSpec.scala (93%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v5/VotingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v5/readme.md (100%) rename src/test/scala/{kiosk/oraclepool/v5 => org/ergoplatform/kiosk/oraclepool/v6}/OraclePool.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v6/OraclePoolLive.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala (98%) rename src/test/scala/{kiosk/oraclepool/v4b => org/ergoplatform/kiosk/oraclepool/v6}/OraclePoolLiveFundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v6/UpdateSpec.scala (92%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v6/VotingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v6/readme.md (100%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/AddressSpec.scala (98%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/Contracts.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/FundingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/OraclePoolParams.scala (96%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/OraclePoolSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/UpdateSpec.scala (93%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/VotingSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/oraclepool/v7/readme.md (100%) rename src/test/scala/{ => org/ergoplatform}/kiosk/script/ScriptSpec.scala (97%) rename src/test/scala/{ => org/ergoplatform}/kiosk/timestamp/v1/Timestamp.scala (93%) rename src/test/scala/{kiosk/timestamp/v2 => org/ergoplatform/kiosk/timestamp/v1}/TimestampSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/timestamp/v2/Timestamp.scala (94%) rename src/test/scala/{kiosk/timestamp/v1 => org/ergoplatform/kiosk/timestamp/v2}/TimestampSpec.scala (95%) rename src/test/scala/{ => org/ergoplatform}/kiosk/timestamp/v2/readme.md (100%) diff --git a/build.sbt b/build.sbt index c884a46..0d7f99b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,14 +1,22 @@ - name := "kiosk" -version := "1.0" -updateOptions := updateOptions.value.withLatestSnapshots(false) +organization := "org.ergoplatform" +version := "1.0.0" +//updateOptions := updateOptions.value.withLatestSnapshots(false) scalaVersion := "2.13.12" +licenses := Seq("CC0" -> url("https://creativecommons.org/publicdomain/zero/1.0/legalcode")) +publishTo := sonatypePublishToBundle.value +scmInfo := Some( + ScmInfo( + url("https://github.com/ergoplatform/kiosk"), + "scm:git@github.com:ergoplatform/kiosk.git" + ) +) 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" % Test, - "org.scalatest" %% "scalatest" % "3.2.18" % Test, + "com.squareup.okhttp3" % "mockwebserver" % "4.12.0", + "org.scalatest" %% "scalatest" % "3.2.18", "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 @@ -42,6 +50,11 @@ pgpSecretRing := file("ci/secring.asc") pgpPassphrase := sys.env.get("PGP_PASSPHRASE").map(_.toArray) usePgpKeyHex("D78982639AD538EF361DEC6BF264D529385A0333") +credentials ++= (for { + username <- Option(System.getenv().get("SONATYPE_USERNAME")) + password <- Option(System.getenv().get("SONATYPE_PASSWORD")) +} yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq + // prefix version with "-SNAPSHOT" for builds without a git tag ThisBuild / dynverSonatypeSnapshots := true // use "-" instead of default "+" diff --git a/src/test/java/org/ergoplatform/appkit/FileMockedErgoClient.java b/src/main/java/org/ergoplatform/kiosk/appkit/FileMockedErgoClient.java similarity index 98% rename from src/test/java/org/ergoplatform/appkit/FileMockedErgoClient.java rename to src/main/java/org/ergoplatform/kiosk/appkit/FileMockedErgoClient.java index 911157c..636035c 100644 --- a/src/test/java/org/ergoplatform/appkit/FileMockedErgoClient.java +++ b/src/main/java/org/ergoplatform/kiosk/appkit/FileMockedErgoClient.java @@ -1,8 +1,9 @@ -package org.ergoplatform.appkit; +package org.ergoplatform.kiosk.appkit; import okhttp3.HttpUrl; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; +import org.ergoplatform.appkit.*; import org.ergoplatform.appkit.impl.BlockchainContextBuilderImpl; import org.ergoplatform.appkit.impl.NodeAndExplorerDataSourceImpl; import org.ergoplatform.explorer.client.ExplorerApiClient; diff --git a/src/test/java/org/ergoplatform/appkit/MockedErgoClient.java b/src/main/java/org/ergoplatform/kiosk/appkit/MockedErgoClient.java similarity index 89% rename from src/test/java/org/ergoplatform/appkit/MockedErgoClient.java rename to src/main/java/org/ergoplatform/kiosk/appkit/MockedErgoClient.java index 82c626c..19ad23f 100644 --- a/src/test/java/org/ergoplatform/appkit/MockedErgoClient.java +++ b/src/main/java/org/ergoplatform/kiosk/appkit/MockedErgoClient.java @@ -1,4 +1,6 @@ -package org.ergoplatform.appkit; +package org.ergoplatform.kiosk.appkit; + +import org.ergoplatform.appkit.ErgoClient; import java.util.List; diff --git a/src/main/scala/kiosk/offchain/readme.md b/src/main/scala/kiosk/offchain/readme.md deleted file mode 100644 index 71e1d0d..0000000 --- a/src/main/scala/kiosk/offchain/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# Tx Builder - -(aka JDE) - -The project has been moved to its own repo at https://github.com/scalahub/jde \ No newline at end of file diff --git a/src/main/scala/kiosk/ErgoUtil.scala b/src/main/scala/org/ergoplatform/kiosk/ErgoUtil.scala similarity index 90% rename from src/main/scala/kiosk/ErgoUtil.scala rename to src/main/scala/org/ergoplatform/kiosk/ErgoUtil.scala index bb6848d..ff1e918 100644 --- a/src/main/scala/kiosk/ErgoUtil.scala +++ b/src/main/scala/org/ergoplatform/kiosk/ErgoUtil.scala @@ -1,8 +1,8 @@ -package kiosk +package org.ergoplatform.kiosk -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.explorer.Explorer +import org.ergoplatform.kiosk.ergo._ +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.explorer.Explorer import scorex.util.encode.Base58 import sigmastate.crypto.SecP256K1Group import sigmastate.eval.{SigmaDsl, _} diff --git a/src/main/scala/kiosk/appkit/Client.scala b/src/main/scala/org/ergoplatform/kiosk/appkit/Client.scala similarity index 95% rename from src/main/scala/kiosk/appkit/Client.scala rename to src/main/scala/org/ergoplatform/kiosk/appkit/Client.scala index 037c8b2..772f65d 100644 --- a/src/main/scala/kiosk/appkit/Client.scala +++ b/src/main/scala/org/ergoplatform/kiosk/appkit/Client.scala @@ -1,4 +1,4 @@ -package kiosk.appkit +package org.ergoplatform.kiosk.appkit import org.ergoplatform.appkit.{BlockchainContext, ErgoClient, NetworkType, RestApiErgoClient} diff --git a/src/test/scala/org/ergoplatform/appkit/HttpClientTesting.scala b/src/main/scala/org/ergoplatform/kiosk/appkit/HttpClientTesting.scala similarity index 86% rename from src/test/scala/org/ergoplatform/appkit/HttpClientTesting.scala rename to src/main/scala/org/ergoplatform/kiosk/appkit/HttpClientTesting.scala index 9c6eedd..bea3424 100644 --- a/src/test/scala/org/ergoplatform/appkit/HttpClientTesting.scala +++ b/src/main/scala/org/ergoplatform/kiosk/appkit/HttpClientTesting.scala @@ -1,4 +1,7 @@ -package org.ergoplatform.appkit +package org.ergoplatform.kiosk.appkit + +import org.ergoplatform.appkit.{FileUtil, NetworkType} +import org.ergoplatform.kiosk.appkit import java.io.File import scala.jdk.CollectionConverters.SeqHasAsJava @@ -30,7 +33,7 @@ object HttpClientTesting { def empty = MockData() } - def createMockedErgoClient(data: MockData): FileMockedErgoClient = { + def createMockedErgoClient(data: MockData): appkit.FileMockedErgoClient = { val nodeResponses = Seq( loadNodeResponse("response_NodeInfo.json"), loadNodeResponse("response_LastHeaders.json")) ++ data.nodeResponses diff --git a/src/test/scala/org/ergoplatform/appkit/MockErgoClient.scala b/src/main/scala/org/ergoplatform/kiosk/appkit/MockErgoClient.scala similarity index 51% rename from src/test/scala/org/ergoplatform/appkit/MockErgoClient.scala rename to src/main/scala/org/ergoplatform/kiosk/appkit/MockErgoClient.scala index 26d7022..247e1f6 100644 --- a/src/test/scala/org/ergoplatform/appkit/MockErgoClient.scala +++ b/src/main/scala/org/ergoplatform/kiosk/appkit/MockErgoClient.scala @@ -1,13 +1,15 @@ -package org.ergoplatform.appkit +package org.ergoplatform.kiosk.appkit -import org.ergoplatform.appkit.HttpClientTesting.{MockData, createMockedErgoClient, networkType} +import org.ergoplatform.appkit.NetworkType +import org.ergoplatform.kiosk.appkit +import org.ergoplatform.kiosk.appkit.HttpClientTesting.{MockData, createMockedErgoClient, networkType} import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.FixtureAnyPropSpec abstract class MockErgoClient extends FixtureAnyPropSpec with Matchers { - case class FixtureParam(client: FileMockedErgoClient) + case class FixtureParam(client: appkit.FileMockedErgoClient) val _networkType: NetworkType = networkType - val ergoClient: FileMockedErgoClient = createMockedErgoClient(MockData(Nil, Nil)) + val ergoClient: appkit.FileMockedErgoClient = createMockedErgoClient(MockData(Nil, Nil)) def withFixture(test: OneArgTest) = { try { diff --git a/src/main/scala/kiosk/appkit/Nodes.scala b/src/main/scala/org/ergoplatform/kiosk/appkit/Nodes.scala similarity index 79% rename from src/main/scala/kiosk/appkit/Nodes.scala rename to src/main/scala/org/ergoplatform/kiosk/appkit/Nodes.scala index ec5b64d..ed9dfa5 100644 --- a/src/main/scala/kiosk/appkit/Nodes.scala +++ b/src/main/scala/org/ergoplatform/kiosk/appkit/Nodes.scala @@ -1,4 +1,4 @@ -package kiosk.appkit +package org.ergoplatform.kiosk.appkit object Nodes { val urls = Seq( diff --git a/src/main/scala/kiosk/encoding/ScalaErgoConverters.scala b/src/main/scala/org/ergoplatform/kiosk/encoding/ScalaErgoConverters.scala similarity index 94% rename from src/main/scala/kiosk/encoding/ScalaErgoConverters.scala rename to src/main/scala/org/ergoplatform/kiosk/encoding/ScalaErgoConverters.scala index 34742f7..945bb03 100644 --- a/src/main/scala/kiosk/encoding/ScalaErgoConverters.scala +++ b/src/main/scala/org/ergoplatform/kiosk/encoding/ScalaErgoConverters.scala @@ -1,9 +1,9 @@ -package kiosk.encoding +package org.ergoplatform.kiosk.encoding import java.math.BigInteger -import kiosk.ergo._ -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.ergo._ import org.ergoplatform.ErgoAddress +import org.ergoplatform.kiosk.script.ScriptUtil import sigmastate.Values.{ConstantNode, ErgoTree} import sigmastate._ import sigmastate.crypto.CryptoConstants.EcPointType diff --git a/src/main/scala/kiosk/ergo/DataType.scala b/src/main/scala/org/ergoplatform/kiosk/ergo/DataType.scala similarity index 93% rename from src/main/scala/kiosk/ergo/DataType.scala rename to src/main/scala/org/ergoplatform/kiosk/ergo/DataType.scala index 8e26d9a..39c8edd 100644 --- a/src/main/scala/kiosk/ergo/DataType.scala +++ b/src/main/scala/org/ergoplatform/kiosk/ergo/DataType.scala @@ -1,6 +1,6 @@ -package kiosk.ergo +package org.ergoplatform.kiosk.ergo -import kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters // Used in JDE and ErgoScriptCompiler object DataType extends MyEnum { diff --git a/src/main/scala/kiosk/ergo/package.scala b/src/main/scala/org/ergoplatform/kiosk/ergo/package.scala similarity index 98% rename from src/main/scala/kiosk/ergo/package.scala rename to src/main/scala/org/ergoplatform/kiosk/ergo/package.scala index 114d28b..3d80d39 100644 --- a/src/main/scala/kiosk/ergo/package.scala +++ b/src/main/scala/org/ergoplatform/kiosk/ergo/package.scala @@ -1,6 +1,6 @@ -package kiosk +package org.ergoplatform.kiosk -import kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters import org.bouncycastle.util.encoders.Hex import org.ergoplatform.appkit.{BlockchainContext, ErgoType, ErgoValue, InputBox, OutBox} import org.ergoplatform.sdk.ErgoToken diff --git a/src/main/scala/kiosk/explorer/Curl.scala b/src/main/scala/org/ergoplatform/kiosk/explorer/Curl.scala similarity index 98% rename from src/main/scala/kiosk/explorer/Curl.scala rename to src/main/scala/org/ergoplatform/kiosk/explorer/Curl.scala index 3aa570c..9536606 100644 --- a/src/main/scala/kiosk/explorer/Curl.scala +++ b/src/main/scala/org/ergoplatform/kiosk/explorer/Curl.scala @@ -1,4 +1,4 @@ -package kiosk.explorer +package org.ergoplatform.kiosk.explorer import java.io.InputStream import java.net.HttpURLConnection diff --git a/src/main/scala/kiosk/explorer/Explorer.scala b/src/main/scala/org/ergoplatform/kiosk/explorer/Explorer.scala similarity index 84% rename from src/main/scala/kiosk/explorer/Explorer.scala rename to src/main/scala/org/ergoplatform/kiosk/explorer/Explorer.scala index 8f1ccb6..099b335 100644 --- a/src/main/scala/kiosk/explorer/Explorer.scala +++ b/src/main/scala/org/ergoplatform/kiosk/explorer/Explorer.scala @@ -1,9 +1,11 @@ -package kiosk.explorer +package org.ergoplatform.kiosk.explorer -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.{KioskBox, KioskType, Token} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.{KioskBox, KioskType, Token} import io.circe.Json -import kiosk.appkit.{Client, Nodes} +import org.ergoplatform.kiosk.appkit.{Client, Nodes} +import org.ergoplatform.kiosk.appkit.{Client, Nodes} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters import scala.util.Try diff --git a/src/main/scala/kiosk/script/ScriptUtil.scala b/src/main/scala/org/ergoplatform/kiosk/script/ScriptUtil.scala similarity index 92% rename from src/main/scala/kiosk/script/ScriptUtil.scala rename to src/main/scala/org/ergoplatform/kiosk/script/ScriptUtil.scala index 45a2b76..d00f1fb 100644 --- a/src/main/scala/kiosk/script/ScriptUtil.scala +++ b/src/main/scala/org/ergoplatform/kiosk/script/ScriptUtil.scala @@ -1,7 +1,7 @@ -package kiosk.script +package org.ergoplatform.kiosk.script -import kiosk.ergo._ -import org.ergoplatform.ErgoAddressEncoder +import org.ergoplatform.kiosk.ergo._ +import org.ergoplatform.{ErgoAddress, ErgoAddressEncoder} import org.ergoplatform.ErgoAddressEncoder.MainnetNetworkPrefix import sigmastate.Values.ErgoTree import sigmastate.eval.CompiletimeIRContext @@ -16,8 +16,6 @@ object ScriptUtil { private val compiler = SigmaCompiler(CompilerSettings(networkPrefix, TransformingSigmaBuilder, lowerMethodCalls = true)) implicit val ergoAddressEncoder: ErgoAddressEncoder = new ErgoAddressEncoder(networkPrefix) - - def addIfNotExist(envMap: MMap[String, KioskType[_]], name: String, kioskType: KioskType[_]) = { envMap .get(name) diff --git a/src/main/scala/kiosk/tx/TxUtil.scala b/src/main/scala/org/ergoplatform/kiosk/tx/TxUtil.scala similarity index 92% rename from src/main/scala/kiosk/tx/TxUtil.scala rename to src/main/scala/org/ergoplatform/kiosk/tx/TxUtil.scala index efbef58..23a4212 100644 --- a/src/main/scala/kiosk/tx/TxUtil.scala +++ b/src/main/scala/org/ergoplatform/kiosk/tx/TxUtil.scala @@ -1,7 +1,7 @@ -package kiosk.tx +package org.ergoplatform.kiosk.tx -import kiosk.encoding.ScalaErgoConverters.getAddressFromString -import kiosk.ergo.{DhtData, KioskBox, KioskType, Token, decodeBigInt} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters.getAddressFromString +import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskType, Token, decodeBigInt} import org.ergoplatform.appkit.{Address, BlockchainContext, InputBox, OutBox, OutBoxBuilder, SignedTransaction} import org.ergoplatform.appkit.impl.ErgoTreeContract import org.ergoplatform.sdk.ErgoToken diff --git a/src/test/scala/kiosk/offchain/readme.md b/src/test/scala/kiosk/offchain/readme.md deleted file mode 100644 index 2ab0bad..0000000 --- a/src/test/scala/kiosk/offchain/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# Tx Builder - -(aka JDE) - -The project has been moved to its own repo at https://github.com/scalahub/jde - -See https://github.com/scalahub/jde/tree/main/src/test/scala/jde for examples \ No newline at end of file diff --git a/src/test/scala/kiosk/offchain/timestamp.json b/src/test/scala/kiosk/offchain/timestamp.json deleted file mode 100644 index 7100f3f..0000000 --- a/src/test/scala/kiosk/offchain/timestamp.json +++ /dev/null @@ -1 +0,0 @@ -Moved to https://github.com/scalahub/jde/blob/main/src/test/resources/timestamp.json diff --git a/src/test/scala/org/sh/kiosk/ergo/Auction.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/Auction.scala similarity index 97% rename from src/test/scala/org/sh/kiosk/ergo/Auction.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/Auction.scala index dd71024..25bb502 100644 --- a/src/test/scala/org/sh/kiosk/ergo/Auction.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/Auction.scala @@ -1,4 +1,4 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo trait Auction { val source = diff --git a/src/test/scala/org/sh/kiosk/ergo/AuctionSpec.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/AuctionSpec.scala similarity index 89% rename from src/test/scala/org/sh/kiosk/ergo/AuctionSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/AuctionSpec.scala index de58f99..d8b96e6 100644 --- a/src/test/scala/org/sh/kiosk/ergo/AuctionSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/AuctionSpec.scala @@ -1,17 +1,15 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo -import kiosk.ErgoUtil -import kiosk.ergo._ -import kiosk.script.ScriptUtil import org.ergoplatform.Pay2SAddress +import org.ergoplatform.kiosk.ErgoUtil import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import org.ergoplatform.kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.script.ScriptUtil._ import scala.collection.mutable.{Map => MMap} class AuctionSpec extends AnyWordSpec with Matchers with Auction { - import kiosk.script.ScriptUtil._ - "Auction script" should { "compile correctly" in { // seller @@ -23,8 +21,6 @@ class AuctionSpec extends AnyWordSpec with Matchers with Auction { val ergoTree = ScriptUtil.compile(env.toMap, source) ergoTree.bytes.encodeHex shouldBe "100b04904e04000400040004020480897a040004000400040208cd02adee2f931b2e011fc44c9ece6ad6ad2e2dafe6506114755f20bad7268b191a3dd802d601c1a7d602e4c6a70407958fa37300d805d603b2a5730100d604b2db63087203730200d605b2db6308a7730300d606c17203d607b2a5730400ededededed938c7204018c720501938c7204028c7205029272069a72017e730505927206720693c27207d0cd720292c172077201d804d603b2a5730600d604b2db63087203730700d605b2db6308a7730800d606b2a5730900edededed938c7204018c720501938c7204028c72050293c27203d0cd720292c17206720193c27206d0730a" - - import ScriptUtil.ergoAddressEncoder Pay2SAddress(ergoTree).toString shouldBe "dEnpB3TwiN24zJ6u2mDgShn2PBB11ZMr1GLGpsTDx8BJnY2RfkuB8nYMKkuhzaN83zJ8bbDFv3vV4xH8zrWFVbpjPJ7Evu4xsfMQmnReHaZCuCAoWKPkzeSXRiL3DnK26ZkFoxso6TNuoYCkCDNXFuU4CTqjQzCB1bMYxeGxybCVUZWzMHBFqGZFkFuYcsxtBFabipgedhVjGcrCtQfdPNqz7ZUZ5mrSSzALdRJ8SgfvESnzM3eHSYRc21GEf9P3HzjgFWuhtyX3KuYfiPjDx3tZfTsrA9RsHJGvtGmkPVSwgoahWCQ6YnZZf888HkDbsCmv9QM877YPvhVKkdnbaans6Pu2LG" } } diff --git a/src/test/scala/org/sh/kiosk/ergo/ErgoMix.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/ErgoMix.scala similarity index 97% rename from src/test/scala/org/sh/kiosk/ergo/ErgoMix.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/ErgoMix.scala index d4d7cc4..578fae4 100644 --- a/src/test/scala/org/sh/kiosk/ergo/ErgoMix.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/ErgoMix.scala @@ -1,4 +1,4 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo trait ErgoMix { diff --git a/src/test/scala/org/sh/kiosk/ergo/ErgoMixSpec.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/ErgoMixSpec.scala similarity index 94% rename from src/test/scala/org/sh/kiosk/ergo/ErgoMixSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/ErgoMixSpec.scala index 35e3e59..33dce13 100644 --- a/src/test/scala/org/sh/kiosk/ergo/ErgoMixSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/ErgoMixSpec.scala @@ -1,17 +1,15 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo -import kiosk.ergo._ -import kiosk.script.ScriptUtil import org.ergoplatform.Pay2SAddress -import sigmastate.serialization.ErgoTreeSerializer.DefaultSerializer import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import sigmastate.serialization.ErgoTreeSerializer.DefaultSerializer +import org.ergoplatform.kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.script.ScriptUtil._ import scala.collection.mutable.{Map => MMap} class ErgoMixSpec extends AnyWordSpec with Matchers with ErgoMix { - import kiosk.script.ScriptUtil._ - "ErgoMix script" should { "compile correctly" in { val env = MMap[String, KioskType[_]]() diff --git a/src/test/scala/org/sh/kiosk/ergo/InterestFreeLoan.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/InterestFreeLoan.scala similarity index 99% rename from src/test/scala/org/sh/kiosk/ergo/InterestFreeLoan.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/InterestFreeLoan.scala index ff849e0..a1987c8 100644 --- a/src/test/scala/org/sh/kiosk/ergo/InterestFreeLoan.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/InterestFreeLoan.scala @@ -1,4 +1,4 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo trait InterestFreeLoan { /* using the description at https://www.ergoforum.org/t/interest-free-loan-contract/67 diff --git a/src/test/scala/org/sh/kiosk/ergo/InterestFreeLoanSpec.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/InterestFreeLoanSpec.scala similarity index 95% rename from src/test/scala/org/sh/kiosk/ergo/InterestFreeLoanSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/InterestFreeLoanSpec.scala index f254626..a6599e7 100644 --- a/src/test/scala/org/sh/kiosk/ergo/InterestFreeLoanSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/InterestFreeLoanSpec.scala @@ -1,12 +1,13 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo -import kiosk.ErgoUtil -import kiosk.ergo._ -import kiosk.script.ScriptUtil import org.ergoplatform.Pay2SAddress -import scorex.crypto.hash.Blake2b256 +import org.ergoplatform.kiosk.ErgoUtil import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import scorex.crypto.hash.Blake2b256 +import org.ergoplatform.kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.script.ScriptUtil._ + import scala.collection.mutable.{Map => MMap} class InterestFreeLoanSpec extends AnyWordSpec with Matchers with InterestFreeLoan { @@ -18,8 +19,6 @@ class InterestFreeLoanSpec extends AnyWordSpec with Matchers with InterestFreeLo val env = MMap[String, KioskType[_]]() - import ScriptUtil._ - env.setCollByte("rateOracleTokenID", rateOracleTokenID) env.setCollByte("usdTokenID", usdTokenID) @@ -44,8 +43,6 @@ class InterestFreeLoanSpec extends AnyWordSpec with Matchers with InterestFreeLo val ergoTree = ScriptUtil.compile(env.toMap, src) ergoTree.bytes.encodeHex shouldBe "101404000518051405040400040208cd02b4257a90a74d2c596aad692454533e265d30b5ac5cba7503e950f3aa98aa39a80702adee2f931b2e011fc44c9ece6ad6ad2e2dafe6506114755f20bad7268b191a3d05d00f04000e20ef3a6cba7fae67bdef5c7acf35658e22c3768c5d282771c61f5675f4a283c41904a00b040005000500040404040e2013080243c81647060bf7c8ebb7df10fc0aee16274810abf91f8c85f5c819d88805d00f04e08903d813d601c1a7d602e4c6a70405d603b2db6501fe730000d604e4c672030405d6059c72027204d6069d9c720573017302d6079d99720172067303d608b2a5730400d60993c27208c2a7d60ac17208d60b997202e4c672080405d60cb2a5730500d60d7306d60e93c2720cd0720dd60f7307d610e4c6a70504d611e4c672080504d612d1edededed93720b7308939c720b7204997201720a7209938cb2db6308720373090001730aeded907211a392721199a3730b9172117210d613b2db6308720c730c00eb02d1edededededededed917207730d720993720a720693720b730e720e93c1720c720793c2b2a5730f00d0cd720f93c1b2a573100072079372107211eb03ea02d19172057201720dea02ea027212cd720fd1eded938c7213017311938c7213027312720eea02ea027212720dd19199a372107313" - - import ScriptUtil.ergoAddressEncoder Pay2SAddress(ergoTree).toString shouldBe "A9esikT7NVU4Epn4JCG6Jq2CMht7YttLszCx6UtjDvoam5czQNP1NnqgFqb7i5Yw8DFsUuqBAumixiYa7uyc8s2Rf3DZPuZ3s22qHnitM5U3ajq5oSTvN2JKDir2cctWpkxVqVWQXCC9yafuorma6t7RQwr6CecfuTSnimwsvrJVfoYNVmpEdVCaiqxPdHMsM3XW7oxmRsVjRqwna3xWbqQ1Fb8uEuHgteGYzkdwBUKjEDg2FtygQzsv5dw5S4ncs5miYe8mS2zCy5KgzCbD8mCAmHBDANCJ3ZdPB55iSYhNWnmAqkQANdyRArHNjaV7QZSAmJ8AXFheRJvsAk8b8TNi97A6avKRJAuLTA5osR7f5pvXc1nD94eUz6F8VHxANBgkvjZkc6We85971MikjnvwAtMzgKvszvjEsWCZb5tmUXXZYZMLfgEhwKqUeCQjt8Dgz74xt5RW7RDBTnKM3LUcux3tpf9w3mUDfiufBjQXRZoZ7T5F9nbau4fySe7frWz232t7zG72JA8K4NvkVz53V3Brie55Ufyuo9dmW1WgnvdxxbSLVYZmDzD6hTbMeapYX1GkCFLsn5UVNrJWN4KTuPt6LQCCtkdrzWf1XfSGd2p4jVXszLCCNUKbNm1ARrxUPGwApBL5pFzfF8WPL7BTYw8i2tPmVy" } } diff --git a/src/test/scala/org/sh/kiosk/ergo/OneWayUSDToken.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/OneWayUSDToken.scala similarity index 89% rename from src/test/scala/org/sh/kiosk/ergo/OneWayUSDToken.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/OneWayUSDToken.scala index 647ce45..812c890 100644 --- a/src/test/scala/org/sh/kiosk/ergo/OneWayUSDToken.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/OneWayUSDToken.scala @@ -1,12 +1,4 @@ -package org.sh.kiosk.ergo - -import kiosk.ErgoUtil -import kiosk.ergo.{KioskErgoTree, _} -import kiosk.script.ScriptUtil -import org.ergoplatform.Pay2SAddress -import scorex.crypto.hash.Blake2b256 - -import scala.collection.mutable.{Map => MMap} +package org.ergoplatform.kiosk.ergo trait OneWayUSDToken { /* using the description at https://www.ergoforum.org/t/tethering-a-token-to-usd-using-the-rate-oracle/118/4 diff --git a/src/test/scala/org/sh/kiosk/ergo/OneWayUSDTokenSpec.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/OneWayUSDTokenSpec.scala similarity index 90% rename from src/test/scala/org/sh/kiosk/ergo/OneWayUSDTokenSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/OneWayUSDTokenSpec.scala index 9cc2af7..ad15801 100644 --- a/src/test/scala/org/sh/kiosk/ergo/OneWayUSDTokenSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/OneWayUSDTokenSpec.scala @@ -1,12 +1,13 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo -import kiosk.ErgoUtil -import kiosk.ergo._ -import kiosk.script.ScriptUtil import org.ergoplatform.Pay2SAddress -import scorex.crypto.hash.Blake2b256 +import org.ergoplatform.kiosk.ErgoUtil import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import scorex.crypto.hash.Blake2b256 +import org.ergoplatform.kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.script.ScriptUtil._ + import scala.collection.mutable.{Map => MMap} class OneWayUSDTokenSpec extends AnyWordSpec with Matchers with OneWayUSDToken { @@ -17,8 +18,6 @@ class OneWayUSDTokenSpec extends AnyWordSpec with Matchers with OneWayUSDToken { val env = MMap[String, KioskType[_]]() - import ScriptUtil._ - env.setCollByte("rateTokenID", rateOracleTokenID) // lender @@ -30,8 +29,6 @@ class OneWayUSDTokenSpec extends AnyWordSpec with Matchers with OneWayUSDToken { val ergoTree = ScriptUtil.compile(env.toMap, source) ergoTree.bytes.encodeHex shouldBe "10080400040004000402040004000e20ef3a6cba7fae67bdef5c7acf35658e22c3768c5d282771c61f5675f4a283c41908cd02adee2f931b2e011fc44c9ece6ad6ad2e2dafe6506114755f20bad7268b191a3dd805d601b2db6308a7730000d602b2a5730100d603b2db63087202730200d604b2a5730300d605b2db6501fe730400ededed90998c7201028c7203029dc17204e4c672050405938cb2db63087205730500017306ed938c7201018c72030193c27202c2a793c27204d07307" - - import ScriptUtil.ergoAddressEncoder Pay2SAddress(ergoTree).toString shouldBe "3Nvu37NpxyjZ4ppVxRBuxMdM2Z9m34KHAds1fr4WTm39XJNXnbLrffMfzzQNZTec6tsKGqDKXg3RFfLRASYRmkaM36nf9McJF1GLG72krbTfL64XadZ53aeNK6NWHTpyQMkrcVrQPiooaBm4aYfXnfyroFdCJPwmAaCL6RgCq7RrVXfyUZcuuaspTJ8hmiECn4Ke7Eio7u2JvLJRaHKQ4mXHSHZtjFQETSMJRDsYDQv67QBXGYfwc7hiEFfeTP2B31BaUPdCTc" } } diff --git a/src/test/scala/org/sh/kiosk/ergo/YieldProtocol.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/YieldProtocol.scala similarity index 92% rename from src/test/scala/org/sh/kiosk/ergo/YieldProtocol.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/YieldProtocol.scala index 595cf64..cf77fb3 100644 --- a/src/test/scala/org/sh/kiosk/ergo/YieldProtocol.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/YieldProtocol.scala @@ -1,12 +1,4 @@ -package org.sh.kiosk.ergo - -import kiosk.ErgoUtil -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil -import scorex.crypto.hash.Blake2b256 -import sigmastate.serialization.ErgoTreeSerializer.DefaultSerializer - -import scala.collection.mutable.{Map => MMap} +package org.ergoplatform.kiosk.ergo /* Using the idea from http://research.paradigm.xyz/Yield.pdf diff --git a/src/test/scala/org/sh/kiosk/ergo/YieldProtocolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/ergo/YieldProtocolSpec.scala similarity index 95% rename from src/test/scala/org/sh/kiosk/ergo/YieldProtocolSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/ergo/YieldProtocolSpec.scala index e547687..71ee3b0 100644 --- a/src/test/scala/org/sh/kiosk/ergo/YieldProtocolSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/ergo/YieldProtocolSpec.scala @@ -1,13 +1,14 @@ -package org.sh.kiosk.ergo +package org.ergoplatform.kiosk.ergo -import kiosk.ErgoUtil -import kiosk.ergo._ -import kiosk.script.ScriptUtil import org.ergoplatform.Pay2SAddress -import scorex.crypto.hash.Blake2b256 -import sigmastate.serialization.ErgoTreeSerializer.DefaultSerializer +import org.ergoplatform.kiosk.ErgoUtil +import org.ergoplatform.kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.script.ScriptUtil._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import scorex.crypto.hash.Blake2b256 +import sigmastate.serialization.ErgoTreeSerializer.DefaultSerializer + import scala.collection.mutable.{Map => MMap} class YieldProtocolSpec extends AnyWordSpec with Matchers with YieldProtocol { @@ -21,8 +22,6 @@ class YieldProtocolSpec extends AnyWordSpec with Matchers with YieldProtocol { val env = MMap[String, KioskType[_]]() - import ScriptUtil._ - env.setCollByte("rateTokenID", rateOracleTokenID) env.setGroupElement("alice", alice) diff --git a/src/test/scala/kiosk/explorer/ExplorerTest.scala b/src/test/scala/org/ergoplatform/kiosk/explorer/ExplorerTest.scala similarity index 99% rename from src/test/scala/kiosk/explorer/ExplorerTest.scala rename to src/test/scala/org/ergoplatform/kiosk/explorer/ExplorerTest.scala index d5deb54..c9c6e01 100644 --- a/src/test/scala/kiosk/explorer/ExplorerTest.scala +++ b/src/test/scala/org/ergoplatform/kiosk/explorer/ExplorerTest.scala @@ -1,4 +1,4 @@ -package kiosk.explorer +package org.ergoplatform.kiosk.explorer import io.circe.{Json, parser} import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper diff --git a/src/test/scala/kiosk/multisecret/MultiProveDlogSpec.scala b/src/test/scala/org/ergoplatform/kiosk/multisecret/MultiProveDlogSpec.scala similarity index 91% rename from src/test/scala/kiosk/multisecret/MultiProveDlogSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/multisecret/MultiProveDlogSpec.scala index b5487c5..0b0b059 100644 --- a/src/test/scala/kiosk/multisecret/MultiProveDlogSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/multisecret/MultiProveDlogSpec.scala @@ -1,11 +1,10 @@ -package kiosk.multisecret +package org.ergoplatform.kiosk.multisecret -import kiosk.ergo._ -import kiosk.tx.TxUtil -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, HttpClientTesting, InputBox, MockErgoClient} -import org.scalatest.matchers.should.Matchers +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 sigmastate.eval._ -import org.scalatest.propspec.AnyPropSpec import sigma.GroupElement import sigmastate.crypto.CryptoConstants diff --git a/src/test/scala/kiosk/nonlazy/Branch.scala b/src/test/scala/org/ergoplatform/kiosk/nonlazy/Branch.scala similarity index 72% rename from src/test/scala/kiosk/nonlazy/Branch.scala rename to src/test/scala/org/ergoplatform/kiosk/nonlazy/Branch.scala index b6ff697..9d5697b 100644 --- a/src/test/scala/kiosk/nonlazy/Branch.scala +++ b/src/test/scala/org/ergoplatform/kiosk/nonlazy/Branch.scala @@ -1,7 +1,7 @@ -package kiosk.nonlazy +package org.ergoplatform.kiosk.nonlazy -import kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} +import org.ergoplatform.kiosk.script.ScriptUtil object Branch { diff --git a/src/test/scala/kiosk/nonlazy/BranchSpec.scala b/src/test/scala/org/ergoplatform/kiosk/nonlazy/BranchSpec.scala similarity index 89% rename from src/test/scala/kiosk/nonlazy/BranchSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/nonlazy/BranchSpec.scala index 552f0c0..2ab4189 100644 --- a/src/test/scala/kiosk/nonlazy/BranchSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/nonlazy/BranchSpec.scala @@ -1,12 +1,10 @@ -package kiosk.nonlazy - -import kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt, KioskLong} -import kiosk.nonlazy.Branch.branchBoxAddress -import kiosk.tx.TxUtil -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, HttpClientTesting, InputBox, MockErgoClient, SignedTransaction} -import org.ergoplatform.sdk.ErgoToken -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec +package org.ergoplatform.kiosk.nonlazy + +import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt, KioskLong} +import Branch.branchBoxAddress +import org.ergoplatform.kiosk.tx.TxUtil +import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, SignedTransaction} +import org.ergoplatform.kiosk.appkit.MockErgoClient import scala.util.Try diff --git a/src/test/scala/kiosk/nonlazy/Split.scala b/src/test/scala/org/ergoplatform/kiosk/nonlazy/Split.scala similarity index 85% rename from src/test/scala/kiosk/nonlazy/Split.scala rename to src/test/scala/org/ergoplatform/kiosk/nonlazy/Split.scala index d71001e..e55ef0a 100644 --- a/src/test/scala/kiosk/nonlazy/Split.scala +++ b/src/test/scala/org/ergoplatform/kiosk/nonlazy/Split.scala @@ -1,9 +1,9 @@ -package kiosk.nonlazy +package org.ergoplatform.kiosk.nonlazy -import kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} import scorex.crypto.hash.Blake2b256 -import kiosk.ergo._ -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.ergo._ +import org.ergoplatform.kiosk.script.ScriptUtil object Split { diff --git a/src/test/scala/kiosk/nonlazy/SplitSpec.scala b/src/test/scala/org/ergoplatform/kiosk/nonlazy/SplitSpec.scala similarity index 93% rename from src/test/scala/kiosk/nonlazy/SplitSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/nonlazy/SplitSpec.scala index ba2f5fd..fee2e1b 100644 --- a/src/test/scala/kiosk/nonlazy/SplitSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/nonlazy/SplitSpec.scala @@ -1,11 +1,10 @@ -package kiosk.nonlazy +package org.ergoplatform.kiosk.nonlazy -import kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt, KioskLong} -import kiosk.nonlazy.Split.splitAddress -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt, KioskLong} +import Split.splitAddress +import org.ergoplatform.kiosk.tx.TxUtil import org.ergoplatform.appkit._ -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec +import org.ergoplatform.kiosk.appkit.MockErgoClient class SplitSpec extends MockErgoClient { val changeAddress = "9f5ZKbECVTm25JTRQHDHGM5ehC8tUw5g1fCBQ4aaE792rWBFrjK" diff --git a/src/test/scala/kiosk/oraclepool/v1/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePool.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v1/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePool.scala index 2491f19..a49f6cc 100644 --- a/src/test/scala/kiosk/oraclepool/v1/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v1 +package org.ergoplatform.kiosk.oraclepool.v1 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scala.collection.mutable.{Map => MMap} @@ -32,7 +32,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolTokenId", poolTokenId) diff --git a/src/test/scala/kiosk/oraclepool/v1/OraclePoolDemo.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolDemo.scala similarity index 98% rename from src/test/scala/kiosk/oraclepool/v1/OraclePoolDemo.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolDemo.scala index 5e05960..6413a1e 100644 --- a/src/test/scala/kiosk/oraclepool/v1/OraclePoolDemo.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolDemo.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v1 +package org.ergoplatform.kiosk.oraclepool.v1 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala index 507a9af..72a357b 100644 --- a/src/test/scala/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolFundingSpec.scala @@ -1,12 +1,11 @@ -package kiosk.oraclepool.v1 +package org.ergoplatform.kiosk.oraclepool.v1 -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolFundingSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v1/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v1/OraclePoolSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolSpec.scala index 752822f..e09e6c7 100644 --- a/src/test/scala/kiosk/oraclepool/v1/OraclePoolSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v1/OraclePoolSpec.scala @@ -1,17 +1,16 @@ -package kiosk.oraclepool.v1 +package org.ergoplatform.kiosk.oraclepool.v1 -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.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 => val pool = new OraclePool { diff --git a/src/test/scala/kiosk/oraclepool/v2/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePool.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v2/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePool.scala index 53fc34e..f82c540 100644 --- a/src/test/scala/kiosk/oraclepool/v2/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v2 +package org.ergoplatform.kiosk.oraclepool.v2 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values.SigmaBoolean @@ -34,7 +34,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolTokenId", poolTokenId) diff --git a/src/test/scala/kiosk/oraclepool/v2/OraclePoolDemo.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolDemo.scala similarity index 98% rename from src/test/scala/kiosk/oraclepool/v2/OraclePoolDemo.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolDemo.scala index bb65f1a..7be6b44 100644 --- a/src/test/scala/kiosk/oraclepool/v2/OraclePoolDemo.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolDemo.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v2 +package org.ergoplatform.kiosk.oraclepool.v2 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala index c60dbdc..d106323 100644 --- a/src/test/scala/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolFundingSpec.scala @@ -1,9 +1,10 @@ -package kiosk.oraclepool.v2 +package org.ergoplatform.kiosk.oraclepool.v2 -import kiosk.tx.TxUtil -import kiosk.ergo._ +import org.ergoplatform.kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ergo._ import org.ergoplatform.appkit.impl.ErgoTreeContract -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, MockErgoClient} +import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox} +import org.ergoplatform.kiosk.appkit.MockErgoClient import org.ergoplatform.sdk.ErgoToken class OraclePoolFundingSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v2/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v2/OraclePoolSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolSpec.scala index 8be1d8b..7b849ea 100644 --- a/src/test/scala/kiosk/oraclepool/v2/OraclePoolSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/OraclePoolSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v2 - -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, HttpClientTesting, InputBox, MockErgoClient, SignedTransaction} +package org.ergoplatform.kiosk.oraclepool.v2 + +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v2/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v2/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v2/readme.md diff --git a/src/test/scala/kiosk/oraclepool/v3/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePool.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v3/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePool.scala index 837d754..671e93f 100644 --- a/src/test/scala/kiosk/oraclepool/v3/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v3 +package org.ergoplatform.kiosk.oraclepool.v3 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values @@ -37,7 +37,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolTokenId", poolTokenId) diff --git a/src/test/scala/kiosk/oraclepool/v3/OraclePoolDemo.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolDemo.scala similarity index 98% rename from src/test/scala/kiosk/oraclepool/v3/OraclePoolDemo.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolDemo.scala index 7325ef6..a78985f 100644 --- a/src/test/scala/kiosk/oraclepool/v3/OraclePoolDemo.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolDemo.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v3 +package org.ergoplatform.kiosk.oraclepool.v3 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala index 01f3e5f..0abe923 100644 --- a/src/test/scala/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolFundingSpec.scala @@ -1,12 +1,11 @@ -package kiosk.oraclepool.v3 +package org.ergoplatform.kiosk.oraclepool.v3 -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolFundingSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v3/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v3/OraclePoolSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolSpec.scala index f8fd8b2..3524976 100644 --- a/src/test/scala/kiosk/oraclepool/v3/OraclePoolSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/OraclePoolSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v3 +package org.ergoplatform.kiosk.oraclepool.v3 -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v3/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v3/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v3/readme.md diff --git a/src/test/scala/kiosk/oraclepool/v4b/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePool.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v4b/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePool.scala index a6cf671..57cf4e4 100644 --- a/src/test/scala/kiosk/oraclepool/v4b/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v4b +package org.ergoplatform.kiosk.oraclepool.v4a -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values @@ -27,7 +27,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolTokenId", poolTokenId) diff --git a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLive.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLive.scala similarity index 92% rename from src/test/scala/kiosk/oraclepool/v4a/OraclePoolLive.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLive.scala index ef74cc1..dd534e2 100644 --- a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLive.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLive.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v4a +package org.ergoplatform.kiosk.oraclepool.v4a -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ trait OraclePoolLive extends OraclePool { lazy val minBoxValue = 2000000 // min value to remain AFTER paying rewards. For min value to keep BEFORE rewards, see minPoolBoxValue diff --git a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala index 9ac92df..09d69ea 100644 --- a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveAddressSpec.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v4a +package org.ergoplatform.kiosk.oraclepool.v4a -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala index 20bf028..6769e82 100644 --- a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala @@ -1,12 +1,11 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v4a -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolLiveFundingSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala index d2fff19..037a0ef 100644 --- a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/OraclePoolLiveSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v4a +package org.ergoplatform.kiosk.oraclepool.v4a -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolLiveSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v4a/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v4a/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4a/readme.md diff --git a/src/test/scala/kiosk/oraclepool/v4a/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePool.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v4a/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePool.scala index 93931cb..2ced4b5 100644 --- a/src/test/scala/kiosk/oraclepool/v4a/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v4a +package org.ergoplatform.kiosk.oraclepool.v4b -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values @@ -27,7 +27,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolTokenId", poolTokenId) diff --git a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLive.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLive.scala similarity index 93% rename from src/test/scala/kiosk/oraclepool/v4b/OraclePoolLive.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLive.scala index c7d94d1..54bf54b 100644 --- a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLive.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLive.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v4b +package org.ergoplatform.kiosk.oraclepool.v4b -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ trait OraclePoolLive extends OraclePool { lazy val minBoxValue = 2000000 // min value to remain AFTER paying rewards. For min value to keep BEFORE rewards, see minPoolBoxValue diff --git a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala index 9bfbe50..a2eaa96 100644 --- a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveAddressSpec.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v4b +package org.ergoplatform.kiosk.oraclepool.v4b -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala index a1e276e..23e6899 100644 --- a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala @@ -1,12 +1,15 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v4b -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken + class OraclePoolLiveFundingSpec extends MockErgoClient { + property("Fund collection") { ergo => ergo.client.execute { implicit ctx: BlockchainContext => val pool = new OraclePoolLive { diff --git a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala index 5020ce1..09192b0 100644 --- a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/OraclePoolLiveSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v4b +package org.ergoplatform.kiosk.oraclepool.v4b -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolLiveSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v4b/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v4b/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v4b/readme.md diff --git a/src/test/scala/kiosk/oraclepool/v6/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePool.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v6/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePool.scala index e1b70a2..5f7de30 100644 --- a/src/test/scala/kiosk/oraclepool/v6/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values @@ -35,7 +35,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolNFT", poolNFT) diff --git a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLive.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLive.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v5/OraclePoolLive.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLive.scala index dde80b3..dfa91b5 100644 --- a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLive.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLive.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ trait OraclePoolLive extends OraclePool { lazy val minBoxValue = 2000000 // min value to remain AFTER paying rewards. For min value to keep BEFORE rewards, see minPoolBoxValue diff --git a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala similarity index 98% rename from src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala index 2ca0777..3591401 100644 --- a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveAddressSpec.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala index 60e8662..911c76c 100644 --- a/src/test/scala/kiosk/oraclepool/v4a/OraclePoolLiveFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveFundingSpec.scala @@ -1,13 +1,11 @@ -package kiosk.oraclepool.v4a +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.tx.TxUtil -import kiosk.ergo._ +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.sdk.ErgoToken -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec - class OraclePoolLiveFundingSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala index 6097beb..1bfd115 100644 --- a/src/test/scala/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/OraclePoolLiveSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolLiveSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v5/UpdateSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/UpdateSpec.scala similarity index 93% rename from src/test/scala/kiosk/oraclepool/v5/UpdateSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/UpdateSpec.scala index fa594bc..5457a39 100644 --- a/src/test/scala/kiosk/oraclepool/v5/UpdateSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/UpdateSpec.scala @@ -1,13 +1,12 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class UpdateSpec extends MockErgoClient { /* diff --git a/src/test/scala/kiosk/oraclepool/v5/VotingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/VotingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v5/VotingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/VotingSpec.scala index c44056a..2bfac2c 100644 --- a/src/test/scala/kiosk/oraclepool/v5/VotingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/VotingSpec.scala @@ -1,13 +1,12 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v5 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec import scala.util.Try diff --git a/src/test/scala/kiosk/oraclepool/v5/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v5/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v5/readme.md diff --git a/src/test/scala/kiosk/oraclepool/v5/OraclePool.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePool.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v5/OraclePool.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePool.scala index 3ee1843..eef7025 100644 --- a/src/test/scala/kiosk/oraclepool/v5/OraclePool.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePool.scala @@ -1,8 +1,8 @@ -package kiosk.oraclepool.v5 +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values @@ -35,7 +35,7 @@ trait OraclePool { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleTokenId) env.setCollByte("poolNFT", poolNFT) diff --git a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLive.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLive.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v6/OraclePoolLive.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLive.scala index ee38d72..85d1534 100644 --- a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLive.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLive.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ trait OraclePoolLive extends OraclePool { lazy val minBoxValue = 2000000 // min value to remain AFTER paying rewards. For min value to keep BEFORE rewards, see minPoolBoxValue diff --git a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala similarity index 98% rename from src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala index eb135ce..50faee6 100644 --- a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveAddressSpec.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveFundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveFundingSpec.scala index 9491be3..a524565 100644 --- a/src/test/scala/kiosk/oraclepool/v4b/OraclePoolLiveFundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveFundingSpec.scala @@ -1,16 +1,13 @@ -package kiosk.oraclepool.v4b +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.tx.TxUtil -import kiosk.ergo._ +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.sdk.ErgoToken -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec - class OraclePoolLiveFundingSpec extends MockErgoClient { - property("Fund collection") { ergo => ergo.client.execute { implicit ctx: BlockchainContext => val pool = new OraclePoolLive { diff --git a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala index 1e6c400..511225f 100644 --- a/src/test/scala/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/OraclePoolLiveSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolLiveSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v6/UpdateSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/UpdateSpec.scala similarity index 92% rename from src/test/scala/kiosk/oraclepool/v6/UpdateSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/UpdateSpec.scala index 322132c..8c24421 100644 --- a/src/test/scala/kiosk/oraclepool/v6/UpdateSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/UpdateSpec.scala @@ -1,13 +1,12 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class UpdateSpec extends MockErgoClient { /* diff --git a/src/test/scala/kiosk/oraclepool/v6/VotingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/VotingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v6/VotingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/VotingSpec.scala index 3b0dd2b..9cc8eb6 100644 --- a/src/test/scala/kiosk/oraclepool/v6/VotingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/VotingSpec.scala @@ -1,13 +1,12 @@ -package kiosk.oraclepool.v6 +package org.ergoplatform.kiosk.oraclepool.v6 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec import scala.util.Try diff --git a/src/test/scala/kiosk/oraclepool/v6/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v6/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v6/readme.md diff --git a/src/test/scala/kiosk/oraclepool/v7/AddressSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/AddressSpec.scala similarity index 98% rename from src/test/scala/kiosk/oraclepool/v7/AddressSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/AddressSpec.scala index e076b8d..64447b2 100644 --- a/src/test/scala/kiosk/oraclepool/v7/AddressSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/AddressSpec.scala @@ -1,6 +1,6 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ import scorex.crypto.hash.Blake2b256 import org.scalatest.matchers.should.Matchers import org.scalatest.propspec.AnyPropSpec diff --git a/src/test/scala/kiosk/oraclepool/v7/Contracts.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/Contracts.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v7/Contracts.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/Contracts.scala index 85d8604..d647351 100644 --- a/src/test/scala/kiosk/oraclepool/v7/Contracts.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/Contracts.scala @@ -1,13 +1,13 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.KioskType -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.KioskType +import org.ergoplatform.kiosk.script.ScriptUtil import scorex.crypto.hash.Blake2b256 import sigmastate.Values import scala.collection.mutable.{Map => MMap} -import kiosk.ergo._ +import org.ergoplatform.kiosk.ergo._ trait Contracts { // constants @@ -31,7 +31,7 @@ trait Contracts { val env = MMap[String, KioskType[_]]() - import kiosk.script.ScriptUtil._ + import org.ergoplatform.kiosk.script.ScriptUtil._ env.setCollByte("oracleTokenId", oracleToken.decodeHex) env.setCollByte("poolNFT", poolNFT.decodeHex) diff --git a/src/test/scala/kiosk/oraclepool/v7/FundingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/FundingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v7/FundingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/FundingSpec.scala index e735ea0..d77e19e 100644 --- a/src/test/scala/kiosk/oraclepool/v7/FundingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/FundingSpec.scala @@ -1,9 +1,10 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken class FundingSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v7/OraclePoolParams.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/OraclePoolParams.scala similarity index 96% rename from src/test/scala/kiosk/oraclepool/v7/OraclePoolParams.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/OraclePoolParams.scala index bc74a6a..ec3e231 100644 --- a/src/test/scala/kiosk/oraclepool/v7/OraclePoolParams.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/OraclePoolParams.scala @@ -1,4 +1,4 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 trait OraclePoolParams extends Contracts { lazy val minBoxValue = 1000000 // min value to remain AFTER paying rewards. For min value to keep BEFORE rewards, see minPoolBoxValue diff --git a/src/test/scala/kiosk/oraclepool/v7/OraclePoolSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/OraclePoolSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v7/OraclePoolSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/OraclePoolSpec.scala index 3f646a6..bed65fd 100644 --- a/src/test/scala/kiosk/oraclepool/v7/OraclePoolSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/OraclePoolSpec.scala @@ -1,14 +1,13 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +import org.ergoplatform.kiosk.ErgoUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class OraclePoolSpec extends MockErgoClient { diff --git a/src/test/scala/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala similarity index 97% rename from src/test/scala/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala index 8f0198c..7a494ef 100644 --- a/src/test/scala/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/RecoverLiveEpochBoxSpec.scala @@ -1,10 +1,11 @@ -package kiosk.oraclepool.v7 - -import kiosk.ErgoUtil -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo.{ByteArrayToBetterByteArray, DhtData, KioskBox, KioskCollByte, KioskGroupElement, KioskInt, KioskLong} -import kiosk.tx.TxUtil -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, MockErgoClient} +package org.ergoplatform.kiosk.oraclepool.v7 + +import org.ergoplatform.kiosk.ErgoUtil +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo.{ByteArrayToBetterByteArray, DhtData, KioskBox, KioskCollByte, KioskGroupElement, KioskInt, KioskLong} +import org.ergoplatform.kiosk.tx.TxUtil +import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox} +import org.ergoplatform.kiosk.appkit.MockErgoClient import org.ergoplatform.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 diff --git a/src/test/scala/kiosk/oraclepool/v7/UpdateSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/UpdateSpec.scala similarity index 93% rename from src/test/scala/kiosk/oraclepool/v7/UpdateSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/UpdateSpec.scala index 44aa3a3..bc81540 100644 --- a/src/test/scala/kiosk/oraclepool/v7/UpdateSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/UpdateSpec.scala @@ -1,13 +1,12 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec class UpdateSpec extends MockErgoClient { /* diff --git a/src/test/scala/kiosk/oraclepool/v7/VotingSpec.scala b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/VotingSpec.scala similarity index 95% rename from src/test/scala/kiosk/oraclepool/v7/VotingSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/VotingSpec.scala index abfb067..6094e5d 100644 --- a/src/test/scala/kiosk/oraclepool/v7/VotingSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/VotingSpec.scala @@ -1,13 +1,12 @@ -package kiosk.oraclepool.v7 +package org.ergoplatform.kiosk.oraclepool.v7 -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ -import kiosk.tx.TxUtil +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.sdk.ErgoToken import scorex.crypto.hash.Blake2b256 -import org.scalatest.matchers.should.Matchers -import org.scalatest.propspec.AnyPropSpec import scala.util.Try diff --git a/src/test/scala/kiosk/oraclepool/v7/readme.md b/src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/readme.md similarity index 100% rename from src/test/scala/kiosk/oraclepool/v7/readme.md rename to src/test/scala/org/ergoplatform/kiosk/oraclepool/v7/readme.md diff --git a/src/test/scala/kiosk/script/ScriptSpec.scala b/src/test/scala/org/ergoplatform/kiosk/script/ScriptSpec.scala similarity index 97% rename from src/test/scala/kiosk/script/ScriptSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/script/ScriptSpec.scala index 5233c58..117f91e 100644 --- a/src/test/scala/kiosk/script/ScriptSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/script/ScriptSpec.scala @@ -1,9 +1,9 @@ -package kiosk.script +package org.ergoplatform.kiosk.script -import kiosk.ErgoUtil -import kiosk.appkit.{Client, Nodes} -import kiosk.encoding.ScalaErgoConverters -import kiosk.ergo._ +import org.ergoplatform.kiosk.ErgoUtil +import org.ergoplatform.kiosk.appkit.{Client, Nodes} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters +import org.ergoplatform.kiosk.ergo._ import org.bouncycastle.util.encoders.Hex import org.ergoplatform.appkit._ import org.ergoplatform.{ErgoAddress, Pay2SAddress} diff --git a/src/test/scala/kiosk/timestamp/v1/Timestamp.scala b/src/test/scala/org/ergoplatform/kiosk/timestamp/v1/Timestamp.scala similarity index 93% rename from src/test/scala/kiosk/timestamp/v1/Timestamp.scala rename to src/test/scala/org/ergoplatform/kiosk/timestamp/v1/Timestamp.scala index eb2bd76..eb6c456 100644 --- a/src/test/scala/kiosk/timestamp/v1/Timestamp.scala +++ b/src/test/scala/org/ergoplatform/kiosk/timestamp/v1/Timestamp.scala @@ -1,9 +1,9 @@ -package kiosk.timestamp.v1 +package org.ergoplatform.kiosk.timestamp.v1 -import kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} import scorex.crypto.hash.Blake2b256 -import kiosk.ergo._ -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.ergo._ +import org.ergoplatform.kiosk.script.ScriptUtil import scala.collection.mutable.{Map => MMap} diff --git a/src/test/scala/kiosk/timestamp/v2/TimestampSpec.scala b/src/test/scala/org/ergoplatform/kiosk/timestamp/v1/TimestampSpec.scala similarity index 95% rename from src/test/scala/kiosk/timestamp/v2/TimestampSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/timestamp/v1/TimestampSpec.scala index 8fc2754..083fa2b 100644 --- a/src/test/scala/kiosk/timestamp/v2/TimestampSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/timestamp/v1/TimestampSpec.scala @@ -1,8 +1,9 @@ -package kiosk.timestamp.v2 +package org.ergoplatform.kiosk.timestamp.v1 -import kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt} -import kiosk.tx.TxUtil -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, MockErgoClient, SignedTransaction} +import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt} +import org.ergoplatform.kiosk.tx.TxUtil +import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, SignedTransaction} +import org.ergoplatform.kiosk.appkit.MockErgoClient import org.ergoplatform.sdk.ErgoToken import scala.util.Try diff --git a/src/test/scala/kiosk/timestamp/v2/Timestamp.scala b/src/test/scala/org/ergoplatform/kiosk/timestamp/v2/Timestamp.scala similarity index 94% rename from src/test/scala/kiosk/timestamp/v2/Timestamp.scala rename to src/test/scala/org/ergoplatform/kiosk/timestamp/v2/Timestamp.scala index a5f3b8d..e7d48ad 100644 --- a/src/test/scala/kiosk/timestamp/v2/Timestamp.scala +++ b/src/test/scala/org/ergoplatform/kiosk/timestamp/v2/Timestamp.scala @@ -1,9 +1,9 @@ -package kiosk.timestamp.v2 +package org.ergoplatform.kiosk.timestamp.v2 -import kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} +import org.ergoplatform.kiosk.encoding.ScalaErgoConverters.{getAddressFromErgoTree, getStringFromAddress} import scorex.crypto.hash.Blake2b256 -import kiosk.ergo._ -import kiosk.script.ScriptUtil +import org.ergoplatform.kiosk.ergo._ +import org.ergoplatform.kiosk.script.ScriptUtil import scala.collection.mutable.{Map => MMap} diff --git a/src/test/scala/kiosk/timestamp/v1/TimestampSpec.scala b/src/test/scala/org/ergoplatform/kiosk/timestamp/v2/TimestampSpec.scala similarity index 95% rename from src/test/scala/kiosk/timestamp/v1/TimestampSpec.scala rename to src/test/scala/org/ergoplatform/kiosk/timestamp/v2/TimestampSpec.scala index b874cb5..283fdb0 100644 --- a/src/test/scala/kiosk/timestamp/v1/TimestampSpec.scala +++ b/src/test/scala/org/ergoplatform/kiosk/timestamp/v2/TimestampSpec.scala @@ -1,8 +1,9 @@ -package kiosk.timestamp.v1 +package org.ergoplatform.kiosk.timestamp.v2 -import kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt} -import kiosk.tx.TxUtil -import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, MockErgoClient, SignedTransaction} +import org.ergoplatform.kiosk.ergo.{DhtData, KioskBox, KioskCollByte, KioskInt} +import org.ergoplatform.kiosk.tx.TxUtil +import org.ergoplatform.appkit.{BlockchainContext, ConstantsBuilder, InputBox, SignedTransaction} +import org.ergoplatform.kiosk.appkit.MockErgoClient import org.ergoplatform.sdk.ErgoToken import scala.util.Try diff --git a/src/test/scala/kiosk/timestamp/v2/readme.md b/src/test/scala/org/ergoplatform/kiosk/timestamp/v2/readme.md similarity index 100% rename from src/test/scala/kiosk/timestamp/v2/readme.md rename to src/test/scala/org/ergoplatform/kiosk/timestamp/v2/readme.md