diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java index b5ee3b5a..9b0219b0 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java @@ -38,11 +38,11 @@ public interface ContractEventSendOperation extends Operation { byte[] getArgs(); /** - * 时间戳; + * 获得交易操作时间; * * @return */ @DataField(order = 5, primitiveType = PrimitiveType.INT64) - long getTs(); + long getTxOpTime(); } diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java index aa3a7b6a..7acc42ba 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java @@ -12,8 +12,8 @@ public class ContractEventSendOpTemplate implements ContractEventSendOperation { private Bytes contractAddress; private byte[] args; private String event; - - private long ts; + //交易操作时间; + private long txOpTime; public ContractEventSendOpTemplate() { } @@ -22,6 +22,7 @@ public class ContractEventSendOpTemplate implements ContractEventSendOperation { this.contractAddress = contractAddress; this.event = event; this.args = args; + this.txOpTime = System.currentTimeMillis(); } @Override @@ -40,11 +41,7 @@ public class ContractEventSendOpTemplate implements ContractEventSendOperation { } @Override - public long getTs() { - return ts; - } - - public void setTs(long ts) { - this.ts = ts; + public long getTxOpTime() { + return txOpTime; } } diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java index b60153fc..beccc539 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java @@ -9,14 +9,12 @@ class ContractEventSendOperationBuilderImpl implements ContractEventSendOperatio @Override public ContractEventSendOperation send(String address, String event, byte[] args) { ContractEventSendOpTemplate op = new ContractEventSendOpTemplate(Bytes.fromBase58(address), event, args); - op.setTs(System.currentTimeMillis()); return op; } @Override public ContractEventSendOperation send(Bytes address, String event, byte[] args) { ContractEventSendOpTemplate op = new ContractEventSendOpTemplate(address, event, args); - op.setTs(System.currentTimeMillis()); return op; } diff --git a/source/test/test-integration/src/test/resources/contract.jar b/source/test/test-integration/src/test/resources/contract.jar index 7c172d0e..ba409a52 100644 Binary files a/source/test/test-integration/src/test/resources/contract.jar and b/source/test/test-integration/src/test/resources/contract.jar differ