From 7db884d96f15238df1b407cd8c1084c1f6d62769 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Mon, 10 Jun 2019 14:38:58 +0800 Subject: [PATCH] replace tx with txOpTime in ContractEventSendOpTemplate.java; and test OK; --- .../ledger/ContractEventSendOperation.java | 4 ++-- .../ContractEventSendOpTemplate.java | 13 +++++-------- ...ContractEventSendOperationBuilderImpl.java | 2 -- .../src/test/resources/contract.jar | Bin 8016 -> 7784 bytes 4 files changed, 7 insertions(+), 12 deletions(-) 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 7c172d0edcb2a34e5aeecddac90a767afd4c204a..ba409a52829499a51a326f2b193ebf243ecd27cd 100644 GIT binary patch delta 2041 zcmZwIX*d*W8^Cc(7}FreWSc=T)-krpWF0cYWEuNzEFonJO_tEK9A)f`m>g?_?3qlm zWeiTK4im?EWRkKZ66b^y4&Lki@?P)r;rZX!{d{;n{)SB!jfCv2d5;0P4v!&eFh@v{ z*We(i0bUp4K+dk*VW@K4r;m!|*5K7A4N^(mdWWSqaAUZShBcmF{xifJvjqqrJQ1$Q znB&LzxwxFgsBDli8H^L(Crpz@NPL2Pe<}DK=g*bJ0#)oysXXr-Ri-=G6imbT(Gu-Wp$ESDha+Am->@EUQ78;g2`0BNjl<4@UQKRRLGN{p z4E__n9frOvB$eqTf0Jb77n&bD@SLbvq_=vXM7DiaJtc7as&i9r;9?(-^)3k3CF zKg6g}pFB6eOS~4!BxOM5w4rxEga=ihLK^)aJRS3)(*?VjqtSt@LGMt>jU?2tH!}WHCUCSBG#z5v1#l_9%D-X|Jtm0>ob)acXSK@*zb!H6d8&FvzfnY6 zFE*u6uV^^lr?13Wa*h$sj%q5IcC8g{ee!ELqSIq&$K|w6ASA4KO$)o@>rgyh*Po-+ z7vk`)!tseu6DJ7L#BsS@XY@OXd16V0XNvqr;!oF%@6ludXTN9 zdalI|MtZf7Y)? z1u=S@VQUfr%l;!oxgoc%ktGeZEl3T_SNm3k-|85{tKaVun zu%x1>wBC2C%#Ya$U-3Nxm`NU z1uXiVX1~Kvr!iiF)w|IBq4ysx-)DPkJo@5l2HlGEJL^&*nzwX98uDSDA=cBFb81!i z^K*?^bE~SbF4VC>{_Pem*&gKL_ij?J0(argz6j?Ly_?rQ&?zpig5RnQ1*zY<^%Sre z4>#e>$7|rmwwdO63c4T3cto0*nWnIQMkhnNC*PAE{r*jXG|+djL$utzoBBf=p>lrH z0sra}5xS;sxv`KiY*7lfcDVNk-f>z{O()51lp>S8b5SemlVgIhG5m4x=)I|-o5i^o z(Du_R$`by(t+mQGGbXUc<|2C3yosW6yNc_}1*H}<@uOKKX67g|iZYO?s*>JF)5=h0 zqbPVm{d2}CJ~Bxs1UFqpn3fV18WU<~kiTVMJB88Pl}?+bF~jPrVH>JHanAh(Bd>IT zZz~zQ5;ab3>HcCHsffYA&u+u%J_OrpNkmyyxR}G0w0rbyE0(zDGAI1;S|&1tIj8C^ z)!S`Kxx0GO8&1YGM)Y;({*?xwgtX=F{p}A|Y6h+;AdT6X{Qh`0SUIia>{7zHbVh(c ze0{Gn+PZXQGs)4^z4m-|7aN}OB4Fv#ZahNfE3NNL@UQ`DYFHm79b%ZqD5ty2Mj8nv$6Z@6v%d8 zvrK|wse6tcf;Ln(Paj{<#YHKUwQ=Y=DR$$EuG@)&b4oYLCu#wAM(|I|x*mW3S>d>3 z(Gm=Xxuxo;5HCt-PW7k7tUn|ctt>Y&zMNc+=+7=4@;dJfKr>>00$bnZbS#1X#wVv4 zKYrLtw(x*qH6#bZP4ZK!uT%PYnk@uF$sRzr016wB9AAv>nz1BmM%fd?h4V!Na9T>I zj4q7e>db!^Fby08j-jwL8sUn!k{jM&YFk&Vy3+abGy5*z)3Vuwlk`}weV+ds3g9}l z&#gpqcKyIUst^~K>Vc~PSLlo4iUPa`zEVY?s6$|>7EsI)sVPv+qqakJj=BalJ|b2V xW^vRwn8#5^VV+0TmL>kLuSK#>^8fGKBhwGA%3B;TbsYwyBIIQGC1noR{{loKsCEDV delta 2250 zcmZ9O=|2<-8-^J~BUww#Sl$RJyU4B~JCS{2EH%O~s0cZYExTD6#x5L7BF3m=SH^@! zlr2%1jGV?YLUhQ9_xFBzpXbAMKfn9=1Fo-zBgO)bwp`pmj>8GK(Tx+3=Ys!+c0bqo zdri1~nL`j{IL{u@oKuDC_Y>hBr_LeCPdQCEkHQ)t`M)8G+n(>_@5@>Gr1vR8UfhVJ~>=&-n^K0**XD?gd2>xGvdAVkidJC>8V1icK`cu zf2h)x4o&*;P*+krcLRY&V`2;O>dP@;?&@(QjnC<8=rom^DuGZSh zH<^wd&3L0|wXCQ&EvB^N!iul>d@Ug8+3!!)QNAfoJxQ!_;Hwn5@+kII~tVMY`k{hR$}0^t-bu>N@k^ z{0!5pr{3$z$7yAS%`dB$^gcfqmpb4f(lumJp081p@kzH8hqS>S?LU;mJ^my~5SV<9A0ydE{*0c}7;+O3JpBFF{vn}sPA#do+_ zlCJc)4RamR0O@b*NQ=?zN*e<4vHrlrwRy)};1z9|5rNs|Q$lIf_khIx05{QaMh!AB zHFGyBz+Q<|)Xyrc!`ogU4u9(GEkkKld<5Vxe6at}%FM|UT;%^tx>@pFXuB219~v^_ zMa1HXdd+#`eLsiE@a;)jd<42C5)Wu|=dqIoGV}tO%>}uG0V;F_n$FA(ZLm>eRpbrD zROb{w{fvsjWAsQJa0ob{QyIET@TwwkQO$?^fPZk-B5$TnrW59%;MP!uYd_ zT`Ba87Uu1y>OS1>c6VGvRSvDsL4*J;r2DR8S!bQgO`&^g}p+Vo2Me(cI%_EAfwBUH9X)P z_T4>5pBj7**nOG}lIW(cO)b`^eIDB3`elXinoYE3sIo-aiV~=$a9AIYgm?tei!@P` z!|>SdItlGbUf9k{8tW0wonBC&erK%dg)%rWb zGZfJ+@62qs1Pii@*Qv1C884kL$4vW5;T?(H&rCa&{jK|b*t!xZ8X~9G5Ob4_{}3V< zaCOhD--O+khC*r7qYlECNXEd`y)N`%tCc3cJR&Id7Y2n#$&?>q>BoK!faC#CjUM?u*=2gDou5$&Ci0jF97~ z%n-|=_r%cC1C5bL&=~!TFw`oQ=AlTh9Eu9Eyl?w?q&El=T)?DWjk5>ri_=!rMg5D_usN zQ+cp1PeX|2ClQIm9#_m#tiEPa(y zO-vmwIToIFVEpH@FnYQcXP&cupGB$?9kFTqc{ zYU)mmWX+i8aX)xLQY~B(j&SuVLQ%#hPLED-yPq2o^_)!E%6xGt+1e-F_Zmni94C0` zX7j>+tV0xktKS6$VJf(l5yP6peKp7GT}SsV-;sBCfb+dpv2*!qy@En&j9q_6zSw^v zv?4Zio11ol)75~yrl2~6^mA_rZO27j!}!#6M?9UuKea&CKi)UuO+61|qQq#zGq3ch zLq!X}idGkk`i&d}Azz9fXT5jJ6J>vBjsHs7-E{1Ta%ZO#cg-~tu7w+qYL?cRlxi<& zEpG^~${N$sS`wD=F~2SJPa-HWp~QWJ zqUOT$`VNxolmIEyJStXg02MO>!>|<2%v1ct-D~L$_Fu%5fFEndcxzwZ{Su4|7KiPz@} zTxG>_-dWK^V}B|sHhs!fCIm7&(<2}At_KMsu(tqU+x6Z8`T7c1H-Sp&Or!I!vD#*? zMq`~|-mT8nE@gj+gx#EwYSZ;0)&j#=h*THlnTV~iCW`5@CGcogSNx8is_Q7s(nHeH za5(9WMRmdf;D5HjcW4Xb6;WN@BO_1*X&-t60R}QTGKDgb+7aJ@G>^y&HahyV1X~;t z3-&xB3k*G?wUqb&YeS2a^HBwq1_54+5q<%r2oho^PdnQ396OX1{@<(5^*ewMuYUo2 CLpZkp