Merge pull request #275 from yanggang-JV/feature/remove-fisco1.3

* remove 1.3 code
WeBankBlockchain · Nov 16, 2020 · 0cac915 · 0cac915
2 parents 8a2e79a + 43f2b6c
commit 0cac915
Show file tree

Hide file tree

Showing 51 changed files with 155 additions and 3,789 deletions.
diff --git a/build.gradle b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     localDeps 'org.projectlombok:lombok:1.18.10'
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-        compile("com.webank:weid-contract-java:1.2.26") {
+        compile("com.webank:weid-contract-java:1.2.27-rc.4-SNAPSHOT") {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
         }
         compile fileTree(dir: 'lib', include: '*.jar')

diff --git a/src/main/java/com/webank/weid/contract/deploy/DeployContract.java b/src/main/java/com/webank/weid/contract/deploy/DeployContract.java
@@ -26,7 +26,6 @@
 import com.webank.weid.config.FiscoConfig;
 import com.webank.weid.constant.ErrorCode;
 import com.webank.weid.constant.WeIdConstant;
-import com.webank.weid.contract.deploy.v1.DeployContractV1;
 import com.webank.weid.contract.deploy.v2.DeployContractV2;
 import com.webank.weid.exception.WeIdBaseException;
 
@@ -86,7 +85,7 @@ public static void main(String[] args) {
 
     public static void deployContract(String privateKey, boolean instantEnable) {
         if (fiscoConfig.getVersion().startsWith(WeIdConstant.FISCO_BCOS_1_X_VERSION_PREFIX)) {
-            DeployContractV1.deployContract(privateKey);
+            throw new WeIdBaseException(ErrorCode.THIS_IS_UNSUPPORTED);
         } else {
             DeployContractV2.deployContract(privateKey, fiscoConfig, instantEnable);
         }