Skip to content

Commit 5d41da2

Browse files
authored
Merge pull request #7 from cocoleecoco/master
0.6.0 release
2 parents d89ab26 + ebb26dc commit 5d41da2

43 files changed

Lines changed: 946 additions & 650 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

abi/src/test/java/org/web3j/abi/UtilsTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static org.hamcrest.MatcherAssert.assertThat;
2727
import static org.web3j.abi.Utils.typeMap;
2828

29+
@SuppressWarnings("unchecked")
2930
public class UtilsTest {
3031

3132
@Test

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ subprojects {
9191
testCompile "junit:junit:$junitVersion",
9292
"org.mockito:mockito-core:$mockitoVersion"
9393
}
94+
95+
tasks.withType(JavaCompile){
96+
options.encoding = "UTF-8"
97+
}
9498
}
9599

96100
configure(subprojects.findAll { it.name != 'integration-tests' }) {

codegen/src/test/java/org/web3j/codegen/SophiaFunctionWrapperGeneratorTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ public void setUp() throws Exception {
3535

3636
@Test
3737
public void testHumanStandardTokenGeneration() throws Exception {
38+
// testCodeGenerationJvmTypes("contracts", "token");
39+
// testCodeGenerationSolidityTypes("contracts", "token");
3840

39-
40-
testCodeGenerationJvmTypes("contracts", "multisig", TXTypeEnum.WASM.name());
41+
//testCodeGenerationJvmTypes("contracts", "multisig", TXTypeEnum.WASM.name());
4142
testCodeGenerationJvmTypes("contracts", "candidateContract", TXTypeEnum.WASM.name());
42-
43+
//testCodeGenerationJvmTypes("contracts", "ticketContract", TXTypeEnum.WASM.name());
44+
//testCodeGenerationSolidityTypes("contracts", "multisig");
4345
}
4446

4547
private void testCodeGenerationJvmTypes(String contractName, String inputFileName, String txType) throws Exception {
@@ -53,6 +55,7 @@ private void testCodeGenerationSolidityTypes(String contractName, String inputFi
5355
private void testCodeGeneration(String contractName, String inputFileName, String packageName, String types, String txType)
5456
throws Exception {
5557

58+
//tempDirPath = "D:\\Workspace\\client-sdk-java\\codegen\\src\\test\\java";
5659
SophiaFunctionWrapperGenerator.main(Arrays.asList(
5760
types,
5861
solidityBaseDir + File.separator + contractName + File.separator
@@ -62,7 +65,7 @@ private void testCodeGeneration(String contractName, String inputFileName, Strin
6265
"-p", packageName,
6366
"-o", tempDirPath,
6467
"-t", txType
65-
).toArray(new String[0]));
68+
).toArray(new String[0])); // https://shipilev.net/blog/2016/arrays-wisdom-ancients/
6669

6770
verifyGeneratedCode(tempDirPath + File.separator
6871
+ packageName.replace('.', File.separatorChar) + File.separator

codegen/src/test/java/org/web3j/contract/test/CandidateContractTest.java

Lines changed: 0 additions & 298 deletions
This file was deleted.

0 commit comments

Comments
 (0)