Merge pull request #7 from cocoleecoco/master

0.6.0 release
PlatONnetwork · Apr 25, 2019 · 5d41da2 · 5d41da2
2 parents d89ab26 + ebb26dc
commit 5d41da2
Show file tree

Hide file tree

Showing 43 changed files with 946 additions and 650 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/abi/src/test/java/org/web3j/abi/UtilsTest.java b/abi/src/test/java/org/web3j/abi/UtilsTest.java
@@ -26,6 +26,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.web3j.abi.Utils.typeMap;
 
+@SuppressWarnings("unchecked")
 public class UtilsTest {
 
     @Test

diff --git a/build.gradle b/build.gradle
@@ -91,6 +91,10 @@ subprojects {
         testCompile "junit:junit:$junitVersion",
                 "org.mockito:mockito-core:$mockitoVersion"
     }
+
+    tasks.withType(JavaCompile){
+        options.encoding = "UTF-8"
+    }
 }
 
 configure(subprojects.findAll { it.name != 'integration-tests' }) {

diff --git a/codegen/src/test/java/org/web3j/codegen/SophiaFunctionWrapperGeneratorTest.java b/codegen/src/test/java/org/web3j/codegen/SophiaFunctionWrapperGeneratorTest.java
@@ -35,11 +35,13 @@ public void setUp() throws Exception {
 
     @Test
     public void testHumanStandardTokenGeneration() throws Exception {
+//        testCodeGenerationJvmTypes("contracts", "token");
+//        testCodeGenerationSolidityTypes("contracts", "token");
 
-
-        testCodeGenerationJvmTypes("contracts", "multisig", TXTypeEnum.WASM.name());
+        //testCodeGenerationJvmTypes("contracts", "multisig", TXTypeEnum.WASM.name());
         testCodeGenerationJvmTypes("contracts", "candidateContract", TXTypeEnum.WASM.name());
-
+        //testCodeGenerationJvmTypes("contracts", "ticketContract", TXTypeEnum.WASM.name());
+        //testCodeGenerationSolidityTypes("contracts", "multisig");
     }
 
     private void testCodeGenerationJvmTypes(String contractName, String inputFileName, String txType) throws Exception {
@@ -53,6 +55,7 @@ private void testCodeGenerationSolidityTypes(String contractName, String inputFi
     private void testCodeGeneration(String contractName, String inputFileName, String packageName, String types, String txType)
             throws Exception {
 
+        //tempDirPath = "D:\\Workspace\\client-sdk-java\\codegen\\src\\test\\java";
         SophiaFunctionWrapperGenerator.main(Arrays.asList(
                 types,
                 solidityBaseDir + File.separator + contractName + File.separator
@@ -62,7 +65,7 @@ private void testCodeGeneration(String contractName, String inputFileName, Strin
                 "-p", packageName,
                 "-o", tempDirPath,
                 "-t", txType
-        ).toArray(new String[0]));
+        ).toArray(new String[0])); // https://shipilev.net/blog/2016/arrays-wisdom-ancients/
 
         verifyGeneratedCode(tempDirPath + File.separator
                 + packageName.replace('.', File.separatorChar) + File.separator

diff --git a/codegen/src/test/java/org/web3j/contract/test/CandidateContractTest.java b/codegen/src/test/java/org/web3j/contract/test/CandidateContractTest.java