Skip to content

Commit 2af5ea2

Browse files
authored
restored few tests (#16)
1 parent dbb81d7 commit 2af5ea2

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "freeton-sdk-client-scala-binding"
22

3-
version := "1.8.0-M1"
3+
version := "1.8.0-M2"
44

55
organization := "com.dancingcode"
66

@@ -53,4 +53,4 @@ envVars in Test := Map(
5353
)
5454

5555
// To test against all versions: `> + test`
56-
// To cross-publish: `> ; + publishSigned; sonatypeBundleRelease`
56+
// To cross-publish: `> ; + publishSigned; sonatypeRelease`

src/test/scala/ton/sdk/client/modules/tvmSpec.scala

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AsyncTvmSpec extends TvmSpec[Future] {
2121
implicit override val ef: Context.Effect[Future] = futureEffect
2222

2323
// Because of the test net timeouts
24-
ignore should "execute_message" in {
24+
it should "execute_message" in {
2525
val abi = AbiJson.fromResource("Subscription.abi.json", getClass.getClassLoader).toOption.get
2626
val tvcSrc = Files.readAllBytes(new File(getClass.getClassLoader.getResource("Subscription.tvc").getFile).toPath)
2727
val tvc = base64(tvcSrc)
@@ -60,12 +60,11 @@ class AsyncTvmSpec extends TvmSpec[Future] {
6060
unlimitedAccount = AccountForExecutor.fromAccount(boc, Option(true))
6161
limitedAccount = AccountForExecutor.fromAccount(boc, Option(false))
6262
// Run executor (unlimited balance should not affect account balance)
63-
result2 <- call(Request.RunExecutor(encodedMsg.message, unlimitedAccount, abi = Option(abi)))
63+
result2 <- call(Request.RunExecutor(encodedMsg.message, unlimitedAccount, abi = Option(abi), return_updated_account = Option(true)))
6464
// Get account balance again
6565
parsed2 <- call(Boc.Request.ParseAccount(result2.account))
66-
assert1 = parsed.parsed.balance == parsed2.parsed.balance
6766
// Run executor in standard mode (limited balance)
68-
result3 <- call(Request.RunExecutor(encodedMsg.message, limitedAccount, abi = Option(abi)))
67+
result3 <- call(Request.RunExecutor(encodedMsg.message, limitedAccount, abi = Option(abi), return_updated_account = Option(true)))
6968
// Check subscription
7069
input = Map("subscriptionId" -> subscriptionId.asJson)
7170
callSet = CallSet("getSubscription", None, Option(input))
@@ -76,7 +75,7 @@ class AsyncTvmSpec extends TvmSpec[Future] {
7675
assert3 = result3.fees.total_account_fees > 0
7776
assert4 = subscriptionPubkey == pubkey
7877
} yield {
79-
assert1 && assert2 && assert3 && assert4
78+
assert2 && assert3 && assert4
8079
}
8180
}
8281
assertValue(resultF)(true)
@@ -91,19 +90,17 @@ abstract class TvmSpec[T[_]] extends AsyncFlatSpec with SdkAssertions[T] {
9190

9291
behavior of "Tvm"
9392

94-
// Because strange failure since 1.7.0
95-
ignore should "run_executor acc_none" in {
93+
it should "run_executor acc_none" in {
9694
val message = "te6ccgEBAQEAXAAAs0gAV2lB0HI8/VEO/pBKDJJJeoOcIh+dL9JzpmRzM8PfdicAPGNEGwRWGaJsR6UYmnsFVC2llSo1ZZN5mgUnCiHf7ZaUBKgXyAAGFFhgAAAB69+UmQS/LjmiQA=="
9795
val result = devNet { implicit ctx =>
98-
ef.flatMap(call(Request.RunExecutor(message, AccountForExecutor.none, skip_transaction_check = true))) { result =>
96+
ef.flatMap(call(Request.RunExecutor(message, AccountForExecutor.none, skip_transaction_check = true, return_updated_account = Option(true)))) { result =>
9997
call(Boc.Request.ParseAccount(result.account))
10098
}
10199
}
102100
assertExpression(result)(p => p.parsed.id === "0:f18d106c11586689b11e946269ec1550b69654a8d5964de668149c28877fb65a" && p.parsed.acc_type_name === "Uninit")
103101
}
104102

105-
// Because strange failure since 1.7.0
106-
ignore should "run_executor acc_uninit" in {
103+
it should "run_executor acc_uninit" in {
107104
val abi = AbiJson.fromResource("Hello.abi.json", getClass.getClassLoader).toOption.get
108105
val tvc = tvcFromResource("Hello.tvc")
109106

@@ -114,7 +111,7 @@ abstract class TvmSpec[T[_]] extends AsyncFlatSpec with SdkAssertions[T] {
114111
val callSet = CallSet("constructor")
115112
ef.flatMap(call(Abi.Request.EncodeMessage(abi, None, Option(deploySet), Option(callSet), signer))) { deployMsg =>
116113
val account = AccountForExecutor.uninit
117-
ef.flatMap(call(Tvm.Request.RunExecutor(deployMsg.message, account))) { result =>
114+
ef.flatMap(call(Tvm.Request.RunExecutor(deployMsg.message, account, return_updated_account = Option(true)))) { result =>
118115
ef.map(call(Boc.Request.ParseAccount(result.account))) { parsed =>
119116
(deployMsg, parsed)
120117
}

0 commit comments

Comments
 (0)