Skip to content

Commit d89ab26

Browse files
danielgogodanielgogo
authored
Merge pull request #6 from coke3636/0.6.0
0.6.0
2 parents 639ca38 + 285fe41 commit d89ab26

15 files changed

Lines changed: 405 additions & 706 deletions

File tree

‎.gitignore‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
2+
# Eclipse project files
3+
.project
4+
.classpath
5+
.settings
6+
7+
# IntelliJ IDEA project files and directories
8+
*.iml
9+
*.ipr
10+
*.iws
11+
.idea/
12+
.gradle/
13+
*.txt
14+
*.log
15+
16+
# Geany project file
17+
.geany
18+
19+
# KDevelop project file and directory
20+
.kdev4/
21+
*.kdev4
22+
23+
# Build targets
24+
/target
25+
*/target
26+
build/
27+
*/build/
28+
*/out/
29+
30+
# Report directories
31+
/reports
32+
*/reports
33+
34+
# Mac-specific directory that no other operating system needs.
35+
.DS_Store
36+
37+
# JVM crash logs
38+
hs_err_pid*.log
39+
dependency-reduced-pom.xml
40+
manager/log
41+
manager/target/
42+
*.class
43+
dao/target/
44+
task/target/
45+
task/bin/
46+
pojo/target/
47+
*.prefs
48+
dao/bin/
49+
canal/target/
50+
*.project
51+
*.classpath
52+
canal/bin/
53+
common/bin/
54+
canal/.settings/
55+
server/target/
56+
task/.settings/
57+
server/bin/
58+
common/target/
59+
manager/bin/
60+
common/.settings/
61+
dao/.settings/
62+
manager/.settings/
63+
pojo/bin/
64+
65+
server/apidoc/doc/
66+
serverdoc/
67+
logs/
68+
codegen/out/
69+
console/out/
70+
core/out/
71+
crypto/out/
72+
integration-tests/out/

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

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

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

4140
testCodeGenerationJvmTypes("contracts", "multisig", TXTypeEnum.WASM.name());
4241
testCodeGenerationJvmTypes("contracts", "candidateContract", TXTypeEnum.WASM.name());
43-
testCodeGenerationJvmTypes("contracts", "ticketContract", TXTypeEnum.WASM.name());
44-
//testCodeGenerationSolidityTypes("contracts", "multisig");
42+
4543
}
4644

4745
private void testCodeGenerationJvmTypes(String contractName, String inputFileName, String txType) throws Exception {
@@ -55,7 +53,6 @@ private void testCodeGenerationSolidityTypes(String contractName, String inputFi
5553
private void testCodeGeneration(String contractName, String inputFileName, String packageName, String types, String txType)
5654
throws Exception {
5755

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

7067
verifyGeneratedCode(tempDirPath + File.separator
7168
+ packageName.replace('.', File.separatorChar) + File.separator

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ private static Credentials loadCredentials(String walletPath) {
4848
return credentials;
4949
}
5050

51-
private Web3j web3j = Web3j.build(new HttpService("http://192.168.9.76:8789"));
52-
//private Web3j web3j = Web3j.build(new HttpService("https://syde.platon.network/test"));
51+
52+
private Web3j web3j = Web3j.build(new HttpService("http://0.0.0.0:0000"));
5353

5454
@Before
5555
public void init() {

‎codegen/src/test/java/org/web3j/contract/test/TicketContractTest.java‎

Lines changed: 20 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import java.math.BigInteger;
55
import java.net.URL;
66
import java.util.List;
7+
import java.util.Map;
78

9+
import jnr.ffi.annotations.In;
810
import org.junit.Before;
911
import org.junit.Test;
1012
import org.slf4j.Logger;
@@ -44,8 +46,8 @@ private static Credentials loadCredentials() {
4446
return credentials;
4547
}
4648

47-
private Web3j web3j = Web3j.build(new HttpService("http://192.168.9.76:8789"));
48-
// private Web3j web3j = Web3j.build(new HttpService("http://10.10.8.209:6789"));
49+
50+
private Web3j web3j = Web3j.build(new HttpService("http://0.0.0.0:0000"));
4951

5052

5153
@Before
@@ -99,81 +101,39 @@ public void VoteTicket() throws Exception {
99101
List<String> ticketList = contract.VoteTicketIds(tickets, txHash);
100102
logger.debug("TicketContract tickets:{}", ticketList);
101103

102-
// 20:09:43.610 [main] DEBUG org.web3j.contract.test.TicketContractTest - TicketContract TransactionReceipt:{"blockHash":"0x85a49bf683c123b4e650721338acad3c6bd3ff71e0f20de8baaf16e5e3e90f67","blockNumber":15548,"blockNumberRaw":"0x3cbc","cumulativeGasUsed":34832,"cumulativeGasUsedRaw":"0x8810","from":"0x493301712671ada506ba6ca7891f436d29185821","gasUsed":34832,"gasUsedRaw":"0x8810","logs":[{"address":"0x1000000000000000000000000000000000000002","blockHash":"0x85a49bf683c123b4e650721338acad3c6bd3ff71e0f20de8baaf16e5e3e90f67","blockNumber":15548,"blockNumberRaw":"0x3cbc","data":"0xebaa7b22526574223a747275652c2244617461223a2235222c224572724d7367223a2273756363657373227d","logIndex":0,"logIndexRaw":"0x0","removed":false,"topics":["0xee64e28ecf7347fbf257cb1ced716cf9d51a1e24f06e0bbe2c3d4f40924049c9"],"transactionHash":"0x7afe907caf45da59bef88b6b708fe45958143a41baa51f6c4410f87d1338e49f","transactionIndex":0,"transactionIndexRaw":"0x0"}],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000001000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000200000000000000","status":"0x1","statusOK":true,"to":"0x1000000000000000000000000000000000000002","transactionHash":"0x7afe907caf45da59bef88b6b708fe45958143a41baa51f6c4410f87d1338e49f","transactionIndex":0,"transactionIndexRaw":"0x0"}
103-
// 20:09:43.629 [main] DEBUG org.web3j.contract.test.TicketContractTest - TicketContract event:{"Ret":true,"ErrMsg":"success","Data":"5"}
104-
// 20:09:43.633 [main] DEBUG org.web3j.contract.test.TicketContractTest - TicketContract tickets:[0x6bf2236d95a98c798abf760e43d8a1a0f375ce095f6f286198053800262988c5, 0x7f3d95634ebdbf0121a7de207b00cf2d2b4846000ec41b4a8a88d1e019701a5e, 0x57d1a6fcd7932a9615f593dbc6d6999912e170286ed1be0c0b31f6f14087c3b4, 0x3ad918e72305b6666efe2abd232554c34bab3f7cd5aa679334cb3ca3a14851ce, 0xe4f0b42906eed5f5e77cb233bd11d30e664f32b5602bda7f84d155462d496cbb]
105104

106105
}
107-
108-
@Test
109-
public void GetTicketDetail() throws Exception {
110-
//票id
111-
String ticketId = "0x6bf2236d95a98c798abf760e43d8a1a0f375ce095f6f286198053800262988c5";
112106

113-
String detail = contract.GetTicketDetail(ticketId).send();
114107

115-
logger.debug("{}",detail);
116108

117-
}
118-
119109
@Test
120-
public void GetBatchTicketDetail() throws Exception {
121-
StringBuilder stringBuilder = new StringBuilder();
122-
//票id
123-
stringBuilder.append("0x6bf2236d95a98c798abf760e43d8a1a0f375ce095f6f286198053800262988c5");
124-
//分割
125-
stringBuilder.append(":");
126-
//票id
127-
stringBuilder.append("0x7f3d95634ebdbf0121a7de207b00cf2d2b4846000ec41b4a8a88d1e019701a5e");
128-
129-
String detail = contract.GetBatchTicketDetail(stringBuilder.toString()).send();
130-
131-
logger.debug("{}",detail);
132-
133-
}
134-
135-
@Test
136-
public void GetCandidateTicketIds() throws Exception {
110+
public void GetCandidateEpoch() throws Exception {
137111
//节点id
138-
String nodeId = "0x4f6c8fd10bfb512793f81a3594120c76b6991d3d06c0cc652035cbfae3fcd7cdc3f3d7a82021dfdb9ea99f014755ec1a640d832a0362b47be688bb31d504f62d";
139-
140-
String ids = contract.GetCandidateTicketIds(nodeId).send();
141-
142-
logger.debug("CandidateTicketIds: {}",ids);
143-
}
144-
145-
146-
@Test
147-
public void GetBatchCandidateTicketIds() throws Exception {
148-
149-
StringBuilder stringBuilder = new StringBuilder();
150-
//候选人id
151-
stringBuilder.append("0x4f6c8fd10bfb512793f81a3594120c76b6991d3d06c0cc652035cbfae3fcd7cdc3f3d7a82021dfdb9ea99f014755ec1a640d832a0362b47be688bb31d504f62d");
152-
//分割
153-
stringBuilder.append(":");
154-
//候选人id
155-
stringBuilder.append("0x01d033b5b07407e377a3eb268bdc3f07033774fb845b7826a6b741430c5e6b719bda5c4877514e8052fa5dbc2f20fb111a576f6696b6a16ca765de49e11e0541");
156-
157-
158-
String detail = contract.GetBatchCandidateTicketIds(stringBuilder.toString()).send();
112+
String nodeId = "0xd124e660938dc3fd63d913ff753fafc262764b22294431e760b572b0b58d5e6b813b32ccbacc326c03171542ae0ff8ff6528625a2d612e0c49240f111eba3c22";
113+
String a = contract.GetCandidateTicketCount(nodeId).send();
114+
//String detail = contract.GetCandidateEpoch(nodeId).send();
159115

160-
logger.debug("{}",detail);
116+
logger.debug("{}",a);
161117

162118
}
163119

164120

165121

166122
@Test
167-
public void GetCandidateEpoch() throws Exception {
168-
//节点id
169-
String nodeId = "0x4f6c8fd10bfb512793f81a3594120c76b6991d3d06c0cc652035cbfae3fcd7cdc3f3d7a82021dfdb9ea99f014755ec1a640d832a0362b47be688bb31d504f62d";
170-
171-
String detail = contract.GetCandidateEpoch(nodeId).send();
123+
public void GetTicketCountByTxHashTest() throws Exception{
124+
String hash = "0x3051e2a46f8ae3139903f2128d8801505b265ca2201dc3cad041038bad0b63d9";
125+
String res = contract.GetTicketCountByTxHash(hash).send();
126+
Map<String,Integer> resMap = JSON.parseObject(res,Map.class);
127+
logger.debug("{}",resMap);
172128

173-
logger.debug("{}",detail);
174129

175130
}
176131

177-
132+
@Test
133+
public void GetCandidateTicketCountTest() throws Exception{
134+
String nodeId ="";
135+
String res = contract.GetCandidateTicketCount(nodeId).send();
136+
Map<String,Integer> resMap = JSON.parseObject(res,Map.class);
137+
}
178138

179139
}

‎codegen/src/test/resources/solidity/admin.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"address":"493301712671ada506ba6ca7891f436d29185821","crypto":{"cipher":"aes-128-ctr","ciphertext":"a4def93021c1d5d2516e6f4deb2504341045569b8e55841b3c92c26382cefe3f","cipherparams":{"iv":"e5cd5c324e8a754ace63864cd3b6ce3a"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"19eaa76bf2238d30ba1e83c0f63f2ccc612c4673cdde994b9d1342aa343c5a00"},"mac":"dd1ce25074f67f93d4f3ce7b315e9408fd137b0f189a74f97a15c1c19390e09a"},"id":"b008bc00-72bb-48e7-b310-4c7cc9d5ca1b","version":3}

0 commit comments

Comments
 (0)