Skip to content

fix bug of event decode #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2020
Merged

fix bug of event decode #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54066eb
fix bug of event decode
dalaocu Oct 22, 2020
972061a
fix test cases
dalaocu Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rc/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ public TransactionResponse decodeReceiptWithoutValues(
String abi, TransactionReceipt transactionReceipt)
throws TransactionException, IOException, ABICodecException;

public Map<String, List<Object>> decodeEvents(String abi, List<Logs> logs)
public Map<String, List<List<Object>>> decodeEvents(String abi, List<Logs> logs)
throws ABICodecException;
}
11 changes: 7 additions & 4 deletions .../src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package org.fisco.bcos.sdk.transaction.codec.decode;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -111,12 +112,12 @@ public TransactionResponse decodeReceiptStatus(TransactionReceipt receipt) {

@SuppressWarnings("static-access")
@Override
public Map<String, List<Object>> decodeEvents(String abi, List<Logs> logs)
public Map<String, List<List<Object>>> decodeEvents(String abi, List<Logs> logs)
throws ABICodecException {
ABIDefinitionFactory abiDefinitionFactory = new ABIDefinitionFactory(cryptoSuite);
ContractABIDefinition contractABIDefinition = abiDefinitionFactory.loadABI(abi);
Map<String, List<ABIDefinition>> eventsMap = contractABIDefinition.getEvents();
Map<String, List<Object>> result = new HashMap<>();
Map<String, List<List<Object>>> result = new HashMap<>();
eventsMap.forEach(
(name, events) -> {
for (ABIDefinition abiDefinition : events) {
Expand All @@ -136,9 +137,11 @@ public Map<String, List<Object>> decodeEvents(String abi, List<Logs> logs)
abiCodecObject.decodeJavaObject(
outputObject, log.getData());
if (result.containsKey(name)) {
result.get("name").addAll(list);
result.get(name).add(list);
} else {
result.put(name, list);
List<List<Object>> l = new ArrayList<>();
l.add(list);
result.put(name, l);
}
} catch (Exception e) {
logger.error(
Expand Down
6 changes: 4 additions & 2 deletions ...ansaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/TransactionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
package org.fisco.bcos.sdk.transaction.model.dto;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -92,11 +93,12 @@ public String getEvents() {
return events;
}

public Map<String, List<Object>> getEventResultMap() {
@JsonIgnore
public Map<String, List<List<Object>>> getEventResultMap() {
if (StringUtils.isEmpty(events)) {
return null;
}
return JsonUtils.fromJson(events, new TypeReference<Map<String, List<Object>>>() {});
return JsonUtils.fromJson(events, new TypeReference<Map<String, List<List<Object>>>>() {});
}

/** @param events the events to set */
Expand Down
4 changes: 2 additions & 2 deletions src/integration-test/java/org/fisco/bcos/sdk/transaction/decoder/EventDecodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void testDecode() throws Exception {
EventLog eventLog = new EventLog(log.getData(), log.getTopics());
List<Object> list = abiCodec.decodeEvent(abi, "LogInit", eventLog);
Assert.assertEquals("test2", list.get(1));
Map<String, List<Object>> map = response.getEventResultMap();
Assert.assertEquals("test2", map.get("LogInit").get(1));
Map<String, List<List<Object>>> map = response.getEventResultMap();
Assert.assertEquals("test2", map.get("LogInit").get(0).get(1));
}
}
8 changes: 5 additions & 3 deletions ...ation-test/java/org/fisco/bcos/sdk/transaction/decoder/TransactionDecoderServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory;
import org.fisco.bcos.sdk.transaction.model.dto.TransactionResponse;
import org.fisco.bcos.sdk.transaction.tools.ContractLoader;
import org.fisco.bcos.sdk.transaction.tools.JsonUtils;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -76,11 +75,14 @@ public void testDecode() throws Exception {
Lists.newArrayList(BigInteger.valueOf(1)));
TransactionResponse transactionResponseWithoutValues =
decoder.decodeReceiptWithoutValues(abi, transactionReceipt);
System.out.println(JsonUtils.toJson(transactionResponseWithoutValues));
// System.out.println(JsonUtils.toJson(transactionResponseWithoutValues));
TransactionResponse transactionResponseWithValues =
decoder.decodeReceiptWithValues(abi, "incrementUint256", transactionReceipt);
// System.out.println(JsonUtils.toJson(transactionResponseWithValues));
Assert.assertEquals("Success", transactionResponseWithValues.getReceiptMessages());
Map<String, List<Object>> events = decoder.decodeEvents(abi, transactionReceipt.getLogs());
Map<String, List<List<Object>>> events =
decoder.decodeEvents(abi, transactionReceipt.getLogs());
// System.out.println(JsonUtils.toJson(events));
Assert.assertEquals(1, events.size());
// setBytes
List<Object> s = Lists.newArrayList("2".getBytes());
Expand Down
14 changes: 7 additions & 7 deletions ...on-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ public void test2ComplexDeploy() throws Exception {
contractAddress,
"0x0000000000000000000000000000000000000000000000000000000000000000"));
// System.out.println(JsonUtils.toJson(response));
Map<String, List<Object>> map = response.getEventResultMap();
Assert.assertEquals("test2", map.get("LogInit").get(1));
Map<String, List<List<Object>>> map = response.getEventResultMap();
Assert.assertEquals("test2", map.get("LogInit").get(0).get(1));
}

@Test
Expand Down Expand Up @@ -296,9 +296,9 @@ public void test6ComplexSetValues() throws Exception {
transactionProcessor.sendTransactionAndGetResponse(
contractAddress, abi, "setValues", paramsSetValues);
// System.out.println(JsonUtils.toJson(transactionResponse));
Map<String, List<Object>> eventsMap = transactionResponse.getEventResultMap();
Map<String, List<List<Object>>> eventsMap = transactionResponse.getEventResultMap();
Assert.assertEquals(1, eventsMap.size());
Assert.assertEquals("set values 字符串", eventsMap.get("LogSetValues").get(2));
Assert.assertEquals("set values 字符串", eventsMap.get("LogSetValues").get(0).get(2));
}

@Test
Expand Down Expand Up @@ -330,10 +330,10 @@ public void test7ComplexSetBytes() throws Exception {
Assert.assertEquals(transactionResponse3.getValuesList().size(), 1);
Assert.assertEquals(transactionResponse3.getValuesList().get(0), "set bytes test");

Map<String, List<Object>> eventsMap3 = transactionResponse3.getEventResultMap();
// System.out.println(JsonUtils.toJson(eventsMap3));
Map<String, List<List<Object>>> eventsMap3 = transactionResponse3.getEventResultMap();
System.out.println(JsonUtils.toJson(eventsMap3));
Assert.assertEquals(1, eventsMap3.size());
Assert.assertEquals("set bytes test", eventsMap3.get("LogSetBytes").get(1));
Assert.assertEquals("set bytes test", eventsMap3.get("LogSetBytes").get(0).get(1));

// getBytes
CallResponse callResponse4 =
Expand Down