From 46e5644cf248f69a4da6953e1b66fa073a8154ce Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Sun, 26 Jun 2022 17:48:03 +0800 Subject: [PATCH] add ClusterUtil update @Router arguments add DOIPUtilTest update log4j2.properties --- build.gradle | 2 +- src/main/base/org/bdware/sc/node/ContractNode.java | 4 ++++ src/main/base/org/bdware/sc/node/FunctionNode.java | 2 +- src/main/base/org/bdware/sc/node/Permission.java | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4f6f64e..0adfd0c 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' } group = "org.bdware.sc" -version = "1.5.6" +version = "1.5.7" tasks.processResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) task copyLibs(type: Copy) { diff --git a/src/main/base/org/bdware/sc/node/ContractNode.java b/src/main/base/org/bdware/sc/node/ContractNode.java index ad302d8..e03e9ff 100644 --- a/src/main/base/org/bdware/sc/node/ContractNode.java +++ b/src/main/base/org/bdware/sc/node/ContractNode.java @@ -192,4 +192,8 @@ public class ContractNode { public void setInstrumentBranch(boolean b) { instrumentBranch = b; } + + public void resetContractName(String name) { + contractName = name; + } } diff --git a/src/main/base/org/bdware/sc/node/FunctionNode.java b/src/main/base/org/bdware/sc/node/FunctionNode.java index a50e704..d789b84 100644 --- a/src/main/base/org/bdware/sc/node/FunctionNode.java +++ b/src/main/base/org/bdware/sc/node/FunctionNode.java @@ -103,7 +103,7 @@ public class FunctionNode extends Script { public void addArg(String arg) { args.add(arg); - if (arg.equals("requester")) { + if (isExport && arg.equals("requester")) { throw new IllegalArgumentException("The argument shouldn't be requester"); } } diff --git a/src/main/base/org/bdware/sc/node/Permission.java b/src/main/base/org/bdware/sc/node/Permission.java index 34a34c2..ec69db9 100644 --- a/src/main/base/org/bdware/sc/node/Permission.java +++ b/src/main/base/org/bdware/sc/node/Permission.java @@ -17,7 +17,8 @@ public enum Permission { CM, DOIP, IRP, - Async; + Async, + Cluster; public static Permission parse(String str) { try {