From 363311937ab3396cb7f989d3cebb44619af7b0e9 Mon Sep 17 00:00:00 2001 From: arhag Date: Thu, 4 Apr 2019 19:24:14 -0400 Subject: [PATCH] fix proxy test contract to work even after NO_DUPLICATE_DEFERRED_ID activation #6115 --- unittests/test-contracts/README.md | 2 +- unittests/test-contracts/proxy/proxy.cpp | 1 + unittests/test-contracts/proxy/proxy.wasm | Bin 18398 -> 18481 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/unittests/test-contracts/README.md b/unittests/test-contracts/README.md index 157455c7202..aa9c0f8dee9 100644 --- a/unittests/test-contracts/README.md +++ b/unittests/test-contracts/README.md @@ -2,6 +2,6 @@ test_ram_limit contract was compiled with eosio.cdt v1.4.1 That contract was ported to compile with eosio.cdt v1.5.0, but the test that uses it is very sensitive to stdlib/eosiolib changes, compilation flags and linker flags. -deferred_test contract was compiled with eosio.cdt v1.6.1 +deferred_test and proxy contracts were compiled with eosio.cdt v1.6.1 The remaining contracts have been ported to compile with eosio.cdt v1.6.x. They were compiled with a patched version of eosio.cdt v1.6.0-rc1 (commit 1c9180ff5a1e431385180ce459e11e6a1255c1a4). diff --git a/unittests/test-contracts/proxy/proxy.cpp b/unittests/test-contracts/proxy/proxy.cpp index 1a199c4a5ba..c9fc324cad5 100644 --- a/unittests/test-contracts/proxy/proxy.cpp +++ b/unittests/test-contracts/proxy/proxy.cpp @@ -59,6 +59,7 @@ void proxy::on_error( uint128_t sender_id, eosio::ignore> ) { get_datastream() >> packed_trx_size; transaction trx; get_datastream() >> trx; + trx.transaction_extensions.clear(); trx.delay_sec = cfg.delay; trx.send( id, get_self() ); diff --git a/unittests/test-contracts/proxy/proxy.wasm b/unittests/test-contracts/proxy/proxy.wasm index c09311385bec5e82bc38b6306b33942f0dc9bee1..b40249782bac38ca92d735ae5363f1218e7f2496 100755 GIT binary patch delta 4312 zcmai1dvH|M89(Pf_U>}C$(3Z6Wb?ZBW|M3l8$z-K$OHBUl7JQvq==|2n`9$d!*0kf z4_joRrQT=&`iIuGQ?Rzw)^<9hGi78@N7Vk#*$qT0 zZ8CfAIp6o4@BO&<&yUlWr|EQLla$NR+*ZEs+e+}0au1TNYHlC?2o8I(?Au58iuFOU z=0L}90Po^tf`O95lWdj6H42u8AF4n6@?&hd+~{#_Pi!BVe1N#vnA|`$_Ly8n-RuKe zT~ai%b80G)%Eq$e+Y`jYPRoH6nw&`O(r{&adRKzD_{kfKCH7cC3TU;V?ZG z8=FYSvzhVi7?C-|9gA(>IguUfBs!ax%5yl6j_(rZ0y;iAdhK|P=cwRW#7Q*B*})|! zh0{c0_9=D!1m2mQ!`GM<#bVj1ovD%R*eGs$#cft6SJGluCIxGO9vk1YGnL7XWyVPf zM|%V)e`Z6pks2&b{T0IaTN3Hacsdr(WD--^*hqRbL2hAB)5e^K-z*v(j%BjxsYGnN zD?;XSkQbnxlcVu$9#$&%^^!85N({~A^Qo$)$+GHEHCgp*^UBLBDSPLDwB(EYo#XyP~4$(WprrW0y^nw$vp(8g+<6Lejyg zEt@3iXh~nv4=BH{_+@&oWgn@8etzSYpGiRpcLh-1RKym1ZN{TMM;yIvax{mL>tz3-N?fYUXZm| zM~ro%hbi4BflHWtKMIx(X_Ajc;R7$%(4pM`b8jsI6l(E1EEj#8cCZr1p6d=kl9Y5v zHw437KrVMq0D0LNr#joxUs>!9z=@`do1hpG_E3MjBoX#66gTibW=52 zEybahONU|#jt%U%s|pIe?y9EuvVXb`>07umREIWUwqL8D5%xW8C6xJ_*4^*e3Ri{{ zlzCO~lue3kfYTIHf?Jmh4T7-N6c{%i@H(LGq_Kj<+)e)1gfddpXcUUB6Q*5ePrFx@ z#Ne@zR0ev*F^nd5#oh03G%3uT;q13X5P+&~^UQ_3s$4trB?lKYJw_L)8mhi)xerw`%&`y>fBuVg_Lc-= zF0em&cR-Of#od?)4;QbZeeA8`XX$NhcgcqSuW{YO#B}Hmo_a1PlteumLPJ+bYPYEX z^Uy|+X%QVH7m2VMyY{5f&Ai6Aufvjx5DsFg_;J^n#OOZxi1BNRKx~{F4B(<_q1sG! zh*vJ8%ABzbgOAKz;9nh(qJZ(Nvhy`yx{TY{+jBeV8dg%;1};lWH(+I@O;}HtMzMZg z8pK*x#v!ZAu0u`=$U9|eSiRb}jCQlfd}FZvvX4{N_#@?4cz}^v3OCkLp&L(2!_AWZ zo*R$^rWBB;{arUl>hl(LAnn`2p$?Uwd65YhQ z0$U2K;dEjtC_CIPPC67y9ST^X?lenYWKsEREN35IZQiNG|8qxkxrdwHh{RLaE|4(O=b< z6E&gUm{rax?mgJ&ydiRW5FF%?bdT-A5b2Wc5zYjvADzcJe{)Hf1j_XS+Wkz|BB%sg z;~r2kOW5aCKKdamt8S$|%&D%DY!AD)dTH+VfDjQ%8tb4$B>y;rnplr4GCjC%Bc35C zYP->(WR#jSnY3KMsZN$h+}3#Rsm>mhG!KX-@)|PTrc0!!=`r0LAv?h&=d?*2`qACd z#n|iBW$smZf8EO7t8S(rF{`&sRuHPjnoi$GyfvAqNRb7+5lg_NYnsaQ7*a?(qzLbZ z{Mw0{g)sCVHA%2qSIZ;3t+ox2qqPrXwah6x%#N6Ak-dL6dCq&R1$2btb;Fn_4U~I)Hh&1Tpt$jN)K1-gNkO5dKvVejJ|ZdNY#XLJ5+1OFZ0B$5L&@zI=0=NoyI& zA+T+J_dTGjN*Z^wm)gcE3q7!q3U`qpafurF%X~k*n_ZcI z6q?O6x^i|JL+A>-C>q~K?ce%85~|pV1ziPYulG_-DEsLG&Z(w@J7;0X3M7)%%lC&n zzN%_@VV>{!A5|OZ{3ZsUk{^5;j8SF=-%mON)Q^!TncB>_!}}}h4_R~}QgcICzvS$2 z<*lNG{@dMoed=mv<7eVk7&n~c$%PNk9wh}#Ap+f9n{N;<@EWEqrb^edD1zG;-K};L zyrP~wv1pj`!7W)XKFnq;xi+|4m+S%k50|8A_eo#(i+t3d>j|1SzoF|#DV15gqkNX@ zd3L!gXZ4vcwa!A0>7)4^+o*pkv9%WOmX^7JHTBid1Y6lRJiF=Qofh_pfWOjb7b;Zb zEyti;6_B6w{RrwGTe>c9F1xZcgIq{1Ysp1)UH?KY$9E9E$y&zZ;}eNdGn+Q!6BFqX zd;yx1@%s`Paz`SY9Z%h7rgx_jQyfnSe-YQc=I-(AHghyF5r2TgE&?Xa!3J-m`n+@s z-?8yjW(;>mz!9v|DNcqrRDGT~l1{Nr1HLl6rQ!o8o)UulIR2@#?7%=XJ;RO<)X{g? z8v|kK;H&J5fePt~S6N`tqNiBzU<*CZwhh(}F1JvE+9;Bb{48(czP zViyLh>1*uc!3e#~!b3}>=gzThLyPGJ_RLUi&4>5~RqjhiDE0vEw+ZmtWbD7^X#JqmW9Z|Z1P@WVV!c5%PL3WNAy%A z6rKvrW}=DsR5+9g5gS{SowR^GBsc9Xza zW)i6kA-v58N=Gup!auC|SV$a+VAy|24U^WXsmNkxu9GNSX`7l_SennwbrF01GZYT5 z|4c8G?>)(Ie}Jp1*GBOlm1Uo0$v4M=7^QY=f%6!mu4 zxWWM-rjn^dGLepic_X|u8%d=}Iae0VE~QeDcxEaSU5JoE_91m=ZSwX3Qc-DhIGrxJ zN_M(s*=DP@*=#j6_{ST6wKf}<%5Jx+@}_E&RjX>T6}nZTs5D6_Rb@)3#UW>@x$-j6 zvcz0@W9?-vplT?YoWGa&3(r142Na@5w8tpXTMTwUanqe_QQ1T_c1H2hUF-#=v0zZs zOrlR|8VeMDmtJNk3I|F8Uezb*hB9g=CNVFwONISDjHN3E)m8IJ(UP9lE#~v0sTi`U z#|+Xe6TOXfYxmJ2_6yBdb>cOmOPZnTvmV8y9*bsBL&0YeyQ0<5{mfoeOZPB;(W9Gh zGAtu@su_wN)(qJvxjYm;NlFw;Cz1i`E2uK>#?IPHHVtQ}0Kil_|jJpl$lPX}Zn7UrV`iqAg zc7tL{Ijd`;t7+)_+1cXT={Wne*hh<*qvRQS6MLhiiB7OjOBy!4AONudrFTV(NAq&L#X*cW;={Uxg` zZI;{g8D^Hw0KT7=?$f$p`A-r9sNHAFst|;`%#CMHS$jhdphFt_yoBSYnghsCP$CA= zC%FGNNlXv2hst&!o;S<->jGYhM?^P9B=vp?nX$gE=eC(O&jq z#RTnRdZoiZpZ1MZHdh}8xP9xpQXiWuswYq780YU6*2ElJv?yc#~D+%{2bEZn5r*Qp5O%=WQ!t*t+NOYLp zx9P6DB@iVZ1xo{##W9m2h%1|V=m={x5;rg@Sv7I9-x}37kGKsB=HZKZl`%Wfc$}1{ zVAR9?=}3y9Xg^nE>?F%dww@qS-}B0l^2Ll*`@t)G)hpocl~-7s$0^%D;@uuj;vabO zBvv<4#(bE=hsl|L6x8fw|M0lwHuF3ScwD;8{2kQD-_u^oO91Cu zYix-0f~YbmyV`o4#Mn9Sj?DvZkqTc--wu6u?)5ULyu%GFQ8^}qQUg0!Uu)}uUgs1) zR^LJ|veLc^Spjyxsqd=1_&U!n=q^>Cs|grJ)&i?F|kvVXUDCAsugsxpKB7&jjRw z(}E}AT0Vq(D}Q%X!9Vza)s>H@DK=x?qld+aEusIB>B zB(dY|uE|0-a0hDgBwsG3bzIaqF^q^k=HXO+A9(@s_)wgG9*ZzOwrJYG60G;Uy=-2F zp~d9D)ift*D{JpC5&6aDMm+!B-17gzp@nRsr3de) zIEMA?YFnXqvd7y-@cgK)w)l3eO^_;x(k{caaLbU$!~!o}TlQ{9uZ`QTaIH-M#@oq0iyBYv3GK(ccE{P!ADJ*Ds81pW*xQiph84*LEC* za$skI9=h<<&S$vd4wIKTsHF*wJ>BJ8EjVlVbpT5`RPN!W<_3hhHAk2s?MwE+=3u@` zo)|hv_py(LX4d15`iKxk`VQ>!=2xyDCD(w4dFAO{KU4YHLSchDJ?zfm*4#|kBg1Ks zkdF8#Cp4{(N?GKAnA9NE*oS7l#7^Wvqz&cIC%r%HMT)2)l@fmRgcb?oyQgO12dMp8 zG2y*=77325Iq3uoSpD_W5K4pGm2d+a48h$L(*u~wgE_gfq54s7&cgD;FVsi{QQ z*;VT)K>dB2w+z4`keEsO;RL5!D1T*p7RtK|qAfZvZ{~mLqG3B?(wK-kcg*Jdh&Yk) zAQe#U%YybH?wZfR{NQz>Nkr?SG;2CMvN&9!2JL|@2Gc|Q42QV+84iGmlL|(@%O|lX zRi81-+onV4N-&7%PRuM$83v8%v+SyRjD}g#(wz-Zx-0>V0QqHW9HFCFAle#5A(X4 zF~}_lo(>`+woNTBM{n#JG5$T4E7NCLNbSsiE`|Tq>N0$AakMUd?d`9q51j5EN;n0GIThSCWPOKG`n$6G;_BRj?9PdH6X*~ zNRtZDz@dWl%NDD3n*GB4bDX1R})Z&4 z=Pyk)LTT