From 231cd2a9d0f55344cb27e349717fa561f835ce7b Mon Sep 17 00:00:00 2001 From: Dmitry Kurinskiy Date: Fri, 30 Apr 2021 11:51:55 +0300 Subject: [PATCH] Fixes #99: use impossible name for relay (#103) --- README.md | 2 ++ model/src/main/scala/aqua/model/transform/BodyConfig.scala | 2 +- model/src/test/scala/aqua/model/Node.scala | 4 ++-- .../src/test/scala/aqua/model/transform/TransformSpec.scala | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 46bb76c1..62ea3a33 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## Aqua +[![release](https://github.com/fluencelabs/aqua/actions/workflows/release.yml/badge.svg)](https://github.com/fluencelabs/aqua/actions/workflows/release.yml) + Aqua is a new-gen language for distributed systems. Aqua programs are executed on many peers, sequentially diff --git a/model/src/main/scala/aqua/model/transform/BodyConfig.scala b/model/src/main/scala/aqua/model/transform/BodyConfig.scala index 55c26825..619fb427 100644 --- a/model/src/main/scala/aqua/model/transform/BodyConfig.scala +++ b/model/src/main/scala/aqua/model/transform/BodyConfig.scala @@ -8,7 +8,7 @@ case class BodyConfig( errorHandlingService: String = "errorHandlingSrv", errorFuncName: String = "error", respFuncName: String = "response", - relayVarName: Option[String] = Some("relay"), + relayVarName: Option[String] = Some("-relay-"), wrapWithXor: Boolean = true ) { diff --git a/model/src/test/scala/aqua/model/Node.scala b/model/src/test/scala/aqua/model/Node.scala index ad36dd7a..4f358a1e 100644 --- a/model/src/test/scala/aqua/model/Node.scala +++ b/model/src/test/scala/aqua/model/Node.scala @@ -84,8 +84,8 @@ object Node { implicit def nodeToCof(tree: Node): Cof = Cofree(tree.tag, Eval.later(Chain.fromSeq(tree.ops.map(nodeToCof)))) - val relay = LiteralModel("relay") - val relayV = VarModel("relay", ScalarType.string) + val relay = LiteralModel("-relay-") + val relayV = VarModel("-relay-", ScalarType.string) val initPeer = LiteralModel.initPeerId val emptyCall = Call(Nil, None) val otherPeer = LiteralModel("other-peer") diff --git a/model/src/test/scala/aqua/model/transform/TransformSpec.scala b/model/src/test/scala/aqua/model/transform/TransformSpec.scala index dcd15089..55333907 100644 --- a/model/src/test/scala/aqua/model/transform/TransformSpec.scala +++ b/model/src/test/scala/aqua/model/transform/TransformSpec.scala @@ -33,7 +33,7 @@ class TransformSpec extends AnyFlatSpec with Matchers { val expectedFC = xor( seq( - dataCall(bc, "relay", initPeer), + dataCall(bc, "-relay-", initPeer), through(relayV), call(1, otherPeer), through(relayV), @@ -71,7 +71,7 @@ class TransformSpec extends AnyFlatSpec with Matchers { val expectedFC = xor( seq( - dataCall(bc, "relay", initPeer), + dataCall(bc, "-relay-", initPeer), call(0, initPeer), through(relayV), call(1, otherPeer), @@ -136,7 +136,7 @@ class TransformSpec extends AnyFlatSpec with Matchers { res.equalsOrPrintDiff( seq( - dataCall(bc, "relay", initPeer), + dataCall(bc, "-relay-", initPeer), Node( CallServiceTag( LiteralModel("\"srv1\""),