mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-03 18:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Try making the dlc fee test suite async (#3227)

Browse source 
* Try making the test suite async

* Push to github to force re-run of CI

* Push to github to force re-run of CI 2
This commit is contained in:
Chris Stewart 2021-06-07 10:23:48 -05:00 • committed by GitHub
parent 5036c419be
commit fc5bb956dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dlc-test/src/test/scala/org/bitcoins/dlc/statictest/DLCFeeTestVectorTest.scala
View file

@ -1,11 +1,16 @@
package org.bitcoins.dlc.statictest package org.bitcoins.dlc.statictest
import org.bitcoins.core.util.FutureUtil
import org.bitcoins.dlc.testgen._ import org.bitcoins.dlc.testgen._
import org.bitcoins.testkitcore.gen.FeeUnitGen import org.bitcoins.testkitcore.gen.FeeUnitGen
import org.bitcoins.testkitcore.util.BitcoinSUnitTest import org.bitcoins.testkitcore.util.BitcoinSJvmTest
import org.scalacheck.Gen import org.scalacheck.Gen
import org.scalatest.Assertion
import play.api.libs.json.JsResult
class DLCFeeTestVectorTest extends BitcoinSUnitTest { import scala.concurrent.Future
class DLCFeeTestVectorTest extends BitcoinSJvmTest {
implicit override val generatorDrivenConfig: PropertyCheckConfiguration = implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
generatorDrivenConfigNewCode generatorDrivenConfigNewCode
@ -46,11 +51,21 @@ class DLCFeeTestVectorTest extends BitcoinSUnitTest {
} }
it should "pass dlc_fee_test" in { it should "pass dlc_fee_test" in {
val vecResult = DLCFeeTestVectorGen.readFromDefaultTestFile() val vecResult: JsResult[Vector[DLCFeeTestVector]] =
DLCFeeTestVectorGen.readFromDefaultTestFile()
assert(vecResult.isSuccess) assert(vecResult.isSuccess)
vecResult.get.foldLeft(succeed) { case (_, testVec) => def assertBatch(vec: Vector[DLCFeeTestVector]): Future[Vector[Assertion]] =
assert(DLCFeeTestVector(testVec.inputs) == testVec) Future {
} vec.map { case testVec =>
assert(DLCFeeTestVector.apply(testVec.inputs) == testVec)
}
}
val assertionsF = FutureUtil
.batchAndParallelExecute(vecResult.get, assertBatch)
.map(_.flatten)
assertionsF.map(_ => succeed)
} }
} }

2
dlc-test/src/test/scala/org/bitcoins/dlc/testgen/DLCFeeTestVector.scala
View file

@ -91,7 +91,7 @@ object DLCFeeTestVectorInput {
object DLCFeeTestVector extends TestVectorParser[DLCFeeTestVector] { object DLCFeeTestVector extends TestVectorParser[DLCFeeTestVector] {
def apply(inputs: DLCFeeTestVectorInput): DLCFeeTestVector = { def apply(inputs: DLCFeeTestVectorInput): DLCFeeTestVector = {
DLCFeeTestVector( DLCFeeTestVector.apply(
inputs, inputs,
inputs.offerFundingFee.satoshis, inputs.offerFundingFee.satoshis,
inputs.offerClosingFee.satoshis, inputs.offerClosingFee.satoshis,