update file

FISCO-BCOS · Jun 24, 2024 · 082e573 · 082e573
1 parent ae45e62
commit 082e573
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 28 deletions.
diff --git a/.ci/ci_check.sh b/.ci/ci_check.sh
@@ -3,4 +3,4 @@
 set -e
 
 bash gradlew verifyGoogleJavaFormat
-bash gradlew build --info
+bash gradlew build
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -26,7 +26,7 @@ jobs:
         run: brew install [email protected] openjdk
       - name: run build test
         if: runner.os == 'Windows'
-        run: ./gradlew.bat build --info
+        run: ./gradlew.bat build
       - name: run integration testing
         if: runner.os != 'Windows'
         run: /bin/bash .ci/ci_check.sh

diff --git a/src/main/java/org/fisco/solc/compiler/Solc.java b/src/main/java/org/fisco/solc/compiler/Solc.java
@@ -21,9 +21,8 @@ public Solc(boolean sm, Version version) {
             if (solc == null || !solc.exists()) {
                 initDefaultBundled(sm, version);
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             logger.error(" Can't init solc compiler, e: ", e);
-            e.printStackTrace();
             throw new RuntimeException("Can't init solc compiler: ", e);
         }
     }

diff --git a/...es/native/ecdsa/win/0.8.26.solc/file.list → ...es/native/ecdsa/win/0.8.26/solc/file.list b/...es/native/ecdsa/win/0.8.26.solc/file.list → ...es/native/ecdsa/win/0.8.26/solc/file.list
diff --git a/...native/ecdsa/win/0.8.26.solc/msvcp140.dll → ...native/ecdsa/win/0.8.26/solc/msvcp140.dll b/...native/ecdsa/win/0.8.26.solc/msvcp140.dll → ...native/ecdsa/win/0.8.26/solc/msvcp140.dll
diff --git a/...tive/ecdsa/win/0.8.26.solc/msvcp140_1.dll → ...tive/ecdsa/win/0.8.26/solc/msvcp140_1.dll b/...tive/ecdsa/win/0.8.26.solc/msvcp140_1.dll → ...tive/ecdsa/win/0.8.26/solc/msvcp140_1.dll
diff --git a/...tive/ecdsa/win/0.8.26.solc/msvcp140_2.dll → ...tive/ecdsa/win/0.8.26/solc/msvcp140_2.dll b/...tive/ecdsa/win/0.8.26.solc/msvcp140_2.dll → ...tive/ecdsa/win/0.8.26/solc/msvcp140_2.dll
diff --git a/...ces/native/ecdsa/win/0.8.26.solc/solc.exe → ...ces/native/ecdsa/win/0.8.26/solc/solc.exe b/...ces/native/ecdsa/win/0.8.26.solc/solc.exe → ...ces/native/ecdsa/win/0.8.26/solc/solc.exe
diff --git a/...urces/native/sm/win/0.8.26.solc/file.list → ...urces/native/sm/win/0.8.26/solc/file.list b/...urces/native/sm/win/0.8.26.solc/file.list → ...urces/native/sm/win/0.8.26/solc/file.list
diff --git a/...es/native/sm/win/0.8.26.solc/msvcp140.dll → ...es/native/sm/win/0.8.26/solc/msvcp140.dll b/...es/native/sm/win/0.8.26.solc/msvcp140.dll → ...es/native/sm/win/0.8.26/solc/msvcp140.dll
diff --git a/.../native/sm/win/0.8.26.solc/msvcp140_1.dll → .../native/sm/win/0.8.26/solc/msvcp140_1.dll b/.../native/sm/win/0.8.26.solc/msvcp140_1.dll → .../native/sm/win/0.8.26/solc/msvcp140_1.dll
diff --git a/.../native/sm/win/0.8.26.solc/msvcp140_2.dll → .../native/sm/win/0.8.26/solc/msvcp140_2.dll b/.../native/sm/win/0.8.26.solc/msvcp140_2.dll → .../native/sm/win/0.8.26/solc/msvcp140_2.dll
diff --git a/...ources/native/sm/win/0.8.26.solc/solc.exe → ...ources/native/sm/win/0.8.26/solc/solc.exe b/...ources/native/sm/win/0.8.26.solc/solc.exe → ...ources/native/sm/win/0.8.26/solc/solc.exe
diff --git a/src/test/java/org/fisco/solc/compiler/test/SolcTest.java b/src/test/java/org/fisco/solc/compiler/test/SolcTest.java
@@ -37,33 +37,30 @@ public void smSolcTest() {
 
     @Test
     public void ecdsaSolcTest() {
-        try {
-            Solc solc = new Solc(false, Version.V0_4_25);
-            Assert.assertNotNull(solc);
-            Assert.assertTrue(solc.getExecutable().exists());
-            Assert.assertTrue(solc.getExecutable().canExecute());
 
-            solc = new Solc(false, Version.V0_5_2);
-            Assert.assertNotNull(solc);
-            Assert.assertTrue(solc.getExecutable().exists());
-            Assert.assertTrue(solc.getExecutable().canExecute());
+        Solc solc = new Solc(false, Version.V0_4_25);
+        Assert.assertNotNull(solc);
+        Assert.assertTrue(solc.getExecutable().exists());
+        Assert.assertTrue(solc.getExecutable().canExecute());
+
+        solc = new Solc(false, Version.V0_5_2);
+        Assert.assertNotNull(solc);
+        Assert.assertTrue(solc.getExecutable().exists());
+        Assert.assertTrue(solc.getExecutable().canExecute());
 
-            solc = new Solc(false, Version.V0_6_10);
-            Assert.assertNotNull(solc);
-            Assert.assertTrue(solc.getExecutable().exists());
-            Assert.assertTrue(solc.getExecutable().canExecute());
+        solc = new Solc(false, Version.V0_6_10);
+        Assert.assertNotNull(solc);
+        Assert.assertTrue(solc.getExecutable().exists());
+        Assert.assertTrue(solc.getExecutable().canExecute());
 
-            solc = new Solc(false, Version.V0_8_11);
-            Assert.assertNotNull(solc);
-            Assert.assertTrue(solc.getExecutable().exists());
-            Assert.assertTrue(solc.getExecutable().canExecute());
+        solc = new Solc(false, Version.V0_8_11);
+        Assert.assertNotNull(solc);
+        Assert.assertTrue(solc.getExecutable().exists());
+        Assert.assertTrue(solc.getExecutable().canExecute());
 
-            solc = new Solc(false, Version.V0_8_26);
-            Assert.assertNotNull(solc);
-            Assert.assertTrue(solc.getExecutable().exists());
-            Assert.assertTrue(solc.getExecutable().canExecute());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        solc = new Solc(false, Version.V0_8_26);
+        Assert.assertNotNull(solc);
+        Assert.assertTrue(solc.getExecutable().exists());
+        Assert.assertTrue(solc.getExecutable().canExecute());
     }
 }