Skip to content

Commit 28a8283

Browse files
phearnotphearnot
committed
added openapi schema
1 parent 8fe3140 commit 28a8283

File tree

11 files changed

+134
-63
lines changed

11 files changed

+134
-63
lines changed

‎.github/workflows/check-pr.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
with:
102102
distribution: 'temurin'
103103
java-version: '17'
104-
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
104+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # 8.0.1
105105
with:
106106
name: waves-fat-jar
107107
- run: java -cp '*' com.wavesplatform.utils.UtilApp smoke
@@ -126,7 +126,7 @@ jobs:
126126
with:
127127
distribution: 'temurin'
128128
java-version: '17'
129-
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
129+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # 8.0.1
130130
with:
131131
name: file-compiler
132132
- run: find -name "*.ride" -type f -exec java -jar file-compiler.jar {} +;

‎node-it/src/test/scala/com/wavesplatform/it/BaseSuite.scala‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ trait BaseSuite
2121
with BeforeAndAfterEach { this: TestSuite & Nodes =>
2222
protected implicit val ec: ExecutionContext = ExecutionContext.Implicits.global
2323

24-
protected def nodeConfigs: Seq[Config] =
25-
NodeConfigs.newBuilder
26-
.overrideBase(_.quorum(0))
27-
.withDefault(1)
28-
.withSpecial(_.nonMiner)
29-
.buildNonConflicting()
24+
import com.wavesplatform.it.NodeConfigs.*
25+
override protected def nodeConfigs: Seq[Config] = Seq(
26+
BiggestMiner.withQuorum(0),
27+
Default.head.notMiner
28+
)
3029

3130
def miner: Node = nodes.head
3231
def notMiner: Node = nodes.last

‎node-it/src/test/scala/com/wavesplatform/it/NodeConfigs.scala‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@ object NodeConfigs {
1515
val NotMiner: Config = Default.last
1616
def randomMiner: Config = Random.shuffle(Miners).head
1717

18+
val BiggestMiner: Config = Miners.last
19+
20+
extension (c: Config) {
21+
def overrides(s: String): Config = ConfigFactory.parseString(s).withFallback(c)
22+
def withQuorum(n: Int): Config = overrides(s"waves.miner.quorum = $n")
23+
def preactivatedFeatures(f: (Int, Height)*): Config = overrides(
24+
s"""waves.blockchain.custom.functionality.pre-activated-features {
25+
${f.map { case (id, height) => s"$id = $height" }.mkString("\n")}
26+
}"""
27+
)
28+
def notMiner: Config = overrides("waves.miner.enable = no")
29+
}
30+
1831
def newBuilder: Builder = Builder(Default, Default.size, Seq.empty)
1932

2033
case class Builder(baseConfigs: Seq[Config], defaultEntities: Int, specialsConfigs: Seq[Config]) {
@@ -57,7 +70,6 @@ object NodeConfigs {
5770

5871
val (defaultNodes: Seq[Config], specialNodes: Seq[Config]) = bc.zipWithIndex
5972
.collect { case (x, i) if NonConflictingNodes.contains(i + 1) => x }
60-
.reverse
6173
.splitAt(defaultEntities)
6274

6375
specialNodes

‎node-it/src/test/scala/com/wavesplatform/it/asset/IssueReissueBurnAssetSuite.scala‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ import monix.execution.atomic.AtomicInt
2121
import scala.concurrent.duration.*
2222

2323
class IssueReissueBurnAssetSuite extends BaseFreeSpec {
24-
override val nodeConfigs: Seq[Config] =
25-
com.wavesplatform.it.NodeConfigs.newBuilder
26-
.overrideBase(_.quorum(0))
27-
.withDefault(1)
28-
.buildNonConflicting()
24+
import com.wavesplatform.it.NodeConfigs.*
25+
override val nodeConfigs: Seq[Config] = Seq(BiggestMiner.withQuorum(0))
2926
private val initialWavesBalance = 100.waves
3027
private val setScriptPrice = 0.01.waves
3128
private val accountCounter = AtomicInt(1000)

‎node-it/src/test/scala/com/wavesplatform/it/sync/BlockV5TestSuite.scala‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@ import com.wavesplatform.common.state.ByteStr
66
import com.wavesplatform.common.utils.Base58
77
import com.wavesplatform.crypto
88
import com.wavesplatform.crypto.Blake2b256
9+
import com.wavesplatform.it.BaseFreeSpec
910
import com.wavesplatform.it.api.SyncHttpApi.*
1011
import com.wavesplatform.it.sync.activation.ActivationStatusRequest
11-
import com.wavesplatform.it.{BaseFreeSpec, NodeConfigs}
1212
import com.wavesplatform.state.Height
1313
import org.scalatest.*
1414

1515
import scala.concurrent.duration.*
1616

1717
class BlockV5TestSuite extends BaseFreeSpec with ActivationStatusRequest with OptionValues {
18-
19-
override def nodeConfigs: Seq[Config] =
20-
NodeConfigs.newBuilder
21-
.overrideBase(_.quorum(0))
22-
.withDefault(1)
23-
.withSpecial(1, _.nonMiner)
24-
.buildNonConflicting()
18+
import com.wavesplatform.it.NodeConfigs.*
19+
override val nodeConfigs: Seq[Config] = Seq(
20+
BiggestMiner.withQuorum(0),
21+
Default.head.notMiner
22+
)
2523

2624
var currentHeight = Height(0)
2725

‎node-it/src/test/scala/com/wavesplatform/it/sync/activation/AcceptFailedScriptActivationSuite.scala‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.wavesplatform.it.sync.activation
22

3-
import scala.concurrent.duration.*
4-
53
import com.typesafe.config.Config
64
import com.wavesplatform.api.http.ApiError.StateCheckFailed
75
import com.wavesplatform.common.state.ByteStr
86
import com.wavesplatform.common.utils.EitherExt2.*
97
import com.wavesplatform.features.BlockchainFeatures
10-
import com.wavesplatform.it.{NodeConfigs, NTPTime}
11-
import com.wavesplatform.it.NodeConfigs.Default
8+
import com.wavesplatform.it.NTPTime
129
import com.wavesplatform.it.api.SyncHttpApi.*
1310
import com.wavesplatform.it.api.TransactionStatus
1411
import com.wavesplatform.it.sync.*
@@ -18,12 +15,14 @@ import com.wavesplatform.lang.v1.estimator.v3.ScriptEstimatorV3
1815
import com.wavesplatform.state.Height
1916
import com.wavesplatform.test.*
2017
import com.wavesplatform.transaction.Asset.IssuedAsset
21-
import com.wavesplatform.transaction.{TxExchangePrice, TxVersion}
2218
import com.wavesplatform.transaction.assets.exchange.{AssetPair, Order}
2319
import com.wavesplatform.transaction.smart.InvokeScriptTransaction
2420
import com.wavesplatform.transaction.smart.script.ScriptCompiler
21+
import com.wavesplatform.transaction.{TxExchangePrice, TxVersion}
2522
import play.api.libs.json.JsObject
2623

24+
import scala.concurrent.duration.*
25+
2726
class AcceptFailedScriptActivationSuite extends BaseTransactionSuite with NTPTime with OverflowBlock {
2827
import AcceptFailedScriptActivationSuite.*
2928

@@ -486,16 +485,17 @@ object AcceptFailedScriptActivationSuite {
486485

487486
private def mkScript(scriptText: String): Option[String] = Some(ScriptCompiler.compile(scriptText, estimator).explicitGet()._1.bytes().base64)
488487

488+
import com.wavesplatform.it.NodeConfigs.*
489+
489490
private def configs(activate: Boolean): Seq[Config] =
490-
NodeConfigs
491-
.Builder(Default, 1, Seq.empty)
492-
.overrideBase(_.quorum(0))
493-
.overrideBase(
494-
_.preactivatedFeatures(
495-
(BlockchainFeatures.BlockV5.id, Height(if (activate) 0 else 9999))
496-
)
497-
)
498-
.overrideBase(_.raw(s"waves.blockchain.custom.functionality.min-asset-info-update-interval = $UpdateInterval"))
499-
.overrideBase(_.raw(s"waves.miner.max-transactions-in-micro-block = $MaxTxsInMicroBlock"))
500-
.buildNonConflicting()
491+
Seq(
492+
BiggestMiner
493+
.withQuorum(0)
494+
.preactivatedFeatures((BlockchainFeatures.BlockV5.id, Height(if (activate) 0 else 9999)))
495+
.overrides(s"""
496+
waves {
497+
blockchain.custom.functionality.min-asset-info-update-interval = $UpdateInterval
498+
miner.max-transactions-in-micro-block = $MaxTxsInMicroBlock
499+
}""")
500+
)
501501
}

‎node-it/src/test/scala/com/wavesplatform/it/sync/finalization/OneNodeFinalizationTestSuite.scala‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.wavesplatform.it.sync.finalization
22

33
import com.typesafe.config.Config
44
import com.wavesplatform.features.BlockchainFeatures
5+
import com.wavesplatform.it.BaseFreeSpec
56
import com.wavesplatform.it.api.*
67
import com.wavesplatform.it.api.SyncHttpApi.*
7-
import com.wavesplatform.it.{BaseFreeSpec, NodeConfigs}
88
import com.wavesplatform.state.Height
99
import com.wavesplatform.test.NumericExt
1010
import com.wavesplatform.utils.ScorexLogging
@@ -14,12 +14,10 @@ import org.scalatest.OptionValues
1414
import scala.concurrent.duration.DurationInt
1515

1616
class OneNodeFinalizationTestSuite extends BaseFreeSpec, OptionValues, ScorexLogging {
17-
override protected def nodeConfigs: Seq[Config] =
18-
NodeConfigs.newBuilder
19-
.overrideBase(_.quorum(0))
20-
.overrideBase(_.preactivatedFeatures((BlockchainFeatures.DeterministicFinality.id, Height(0))))
21-
.withDefault(1)
22-
.buildNonConflicting()
17+
import com.wavesplatform.it.NodeConfigs.*
18+
override val nodeConfigs: Seq[Config] = Seq(
19+
BiggestMiner.withQuorum(0).preactivatedFeatures((BlockchainFeatures.DeterministicFinality.id, Height(0)))
20+
)
2321

2422
private def node = dockerNodes().last
2523
private lazy val miner1Acc = node.keyPair

‎node-it/src/test/scala/com/wavesplatform/it/sync/grpc/AssetsApiGrpcSuite.scala‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ class AssetsApiGrpcSuite extends BaseFreeSpec with ActivationStatusRequest with
4040
nftHeightsWithSequences.groupMap(_._1)(_._2).values.foreach(nums => nums shouldBe (1 to nums.size))
4141
}
4242

43-
override def nodeConfigs: Seq[Config] =
44-
NodeConfigs.newBuilder
45-
.overrideBase(_.quorum(0))
46-
.withDefault(1)
47-
.buildNonConflicting()
43+
import com.wavesplatform.it.NodeConfigs.*
44+
override val nodeConfigs: Seq[Config] = Seq(BiggestMiner.withQuorum(0))
4845
}

‎node-it/src/test/scala/com/wavesplatform/it/sync/network/PeersApiRouteSuite.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ package com.wavesplatform.it.sync.network
33
import com.typesafe.config.Config
44
import com.wavesplatform.it.api.SyncHttpApi.*
55
import com.wavesplatform.it.api.{KnownPeer, Peer}
6-
import com.wavesplatform.it.{BaseFreeSpec, Node, NodeConfigs}
6+
import com.wavesplatform.it.{BaseFreeSpec, Node}
77
import org.scalatest.concurrent.Eventually
88
import org.scalatest.time.Span
99

1010
import scala.concurrent.duration.DurationInt
1111

1212
class PeersApiRouteSuite extends BaseFreeSpec with Eventually {
13-
override protected def nodeConfigs: Seq[Config] = NodeConfigs.newBuilder
14-
.overrideBase(_.quorum(0))
15-
.withDefault(1)
16-
.withSpecial(_.nonMiner)
17-
.buildNonConflicting()
13+
import com.wavesplatform.it.NodeConfigs.*
14+
override val nodeConfigs: Seq[Config] = Seq(
15+
BiggestMiner.withQuorum(0),
16+
Default.head.notMiner
17+
)
1818

1919
private def ofANode(node: Node): PartialFunction[Any, Unit] = {
2020
case Peer(_, declaredAddress, name) :: Nil if name == node.name && declaredAddress == node.networkAddress.toString =>

‎node-it/src/test/scala/com/wavesplatform/it/sync/network/SimpleTransactionsSuite.scala‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.wavesplatform.it.sync.network
33
import com.typesafe.config.Config
44
import com.wavesplatform.account.Address
55
import com.wavesplatform.common.utils.EitherExt2.*
6-
import com.wavesplatform.it.NodeConfigs
76
import com.wavesplatform.it.api.AsyncNetworkApi.*
87
import com.wavesplatform.it.api.SyncHttpApi.*
98
import com.wavesplatform.it.sync.*
@@ -16,11 +15,8 @@ import java.nio.charset.StandardCharsets
1615
import scala.concurrent.duration.*
1716

1817
class SimpleTransactionsSuite extends BaseTransactionSuite {
19-
override protected def nodeConfigs: Seq[Config] =
20-
NodeConfigs.newBuilder
21-
.overrideBase(_.quorum(0))
22-
.withDefault(entitiesNumber = 1)
23-
.buildNonConflicting()
18+
import com.wavesplatform.it.NodeConfigs.*
19+
override val nodeConfigs: Seq[Config] = Seq(BiggestMiner.withQuorum(0))
2420

2521
private def node = nodes.head
2622

0 commit comments

Comments
 (0)
⚡