From 6b3eeb5504d8e51ff338651319d6ef84b73443d2 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 5 Dec 2018 10:45:38 -0800 Subject: [PATCH] fix: bpf programs are now shared objects --- web3.js/test/bpf-loader.test.js | 2 +- web3.js/test/fixtures/noop/build.sh | 2 +- web3.js/test/fixtures/noop/noop.o | Bin 2336 -> 0 bytes web3.js/test/fixtures/noop/noop.so | Bin 0 -> 3520 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 web3.js/test/fixtures/noop/noop.o create mode 100755 web3.js/test/fixtures/noop/noop.so diff --git a/web3.js/test/bpf-loader.test.js b/web3.js/test/bpf-loader.test.js index 68a25ab04e..4a461a8386 100644 --- a/web3.js/test/bpf-loader.test.js +++ b/web3.js/test/bpf-loader.test.js @@ -25,7 +25,7 @@ test('load BPF program', async () => { const connection = new Connection(url); const from = await newAccountWithTokens(connection, 1024); - const data = await fs.readFile('test/fixtures/noop/noop.o'); + const data = await fs.readFile('test/fixtures/noop/noop.so'); const programId = await BpfLoader.load(connection, from, data); const transaction = new Transaction().add({ keys: [from.publicKey], diff --git a/web3.js/test/fixtures/noop/build.sh b/web3.js/test/fixtures/noop/build.sh index 452c692194..0043703b15 100755 --- a/web3.js/test/fixtures/noop/build.sh +++ b/web3.js/test/fixtures/noop/build.sh @@ -4,4 +4,4 @@ set -ex cd "$(dirname "$0")" make -C ../../../examples/bpf-c-noop/ -cp ../../../examples/bpf-c-noop/out/noop.o . +cp ../../../examples/bpf-c-noop/out/noop.so . diff --git a/web3.js/test/fixtures/noop/noop.o b/web3.js/test/fixtures/noop/noop.o deleted file mode 100644 index 896767873683a089d71c678282e6a45789a82c41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2336 zcmb_dPe@c@5TD)DUHhjkSh^r=hae=DRn!bREJh*ZAp$9auq~I>Sbe%a(2sYBh%TK{ z%EXf^Wb3Wl?(GE~>gds9$BuT$y4lP(GyB$8;=u;qn{R&e=bLY4zW1Kp9K98dL_jG5 zzaWql1z3*->#SX7p#?4dF2*}UPA}U5_L0mg>#L&olHc|TA(=^f# zEDSL;j^olS(;J{8p0GTK!*R!=;W&&p#>t?km;7q?^;c{dh_wJ<%3zj;ED&o2$l}U> zXGOH%vG#2jST?1UUHEe>Q+|YaYunaN^YxM+t?c#G*#9Ein{&*oxDQd4(}wB^k(-1! zGuL`*eGaoX@40Sj-w_|S0n7&HU%-7*h%5;AdVX_$Pd_nV+qJx&7oLmg@cp>Hx}Tq8 z`!?y@TnEdCBl$>*kX z(SFm3Q~1VnN;Wq@oAEacF7lJ>sJa|nBUI`$(dLVc^m#?n9E%&(5QXr1DC5_uawladd~P}alGghV8(G~(@%gfH}@F1 znI=9uJe(Q7#;jNPkcd~A4~i&!K*RwJJwDjaP@ib}Fd=6m=jLd$-gK|P87$3zp(_|g zN^&6HuH56T11R^c5u)D@wMfkCs;sPZPE?`&SDAd}ld6#AcO>AtptKLQR{eFhmJy>E mefTs|Mf$4uSamW^)`zfud}L(Q#PXW>>->@5S$uSVo!dWz8V)D` diff --git a/web3.js/test/fixtures/noop/noop.so b/web3.js/test/fixtures/noop/noop.so new file mode 100755 index 0000000000000000000000000000000000000000..df281c148578e6ff2690640fab9e9499106e3d65 GIT binary patch literal 3520 zcmbtWO>A355MC!ONhu{I5J)2x9=A}5mlx9*yBtVEsR~L_R1qNrD6wP54)`avU)8RB zphe=|A}CQ$NhM0T<>uU6sRxj_~H7WnVs30ee>Rz z?@piXiNy>?ulduk^gxM8#j8*2gkaJnO)vc)F^8S*LE@kv#liux1Dc~EvkzXHVdFjU z8KDgjc0I&DMZbBqi(--$XaM^~G|gi&879Z@$;{UjPm6|Kk@beAqCWC_iy4-gs*gNy z@@&62*wquhc|+{`NSS@wZ^ZLZ|Dapg-ADGF?TPLqeCIxa^ZSeQ+q|j!)8RRV_D0eX zeTTRn#x%coBE|We(;s+AWLx#zq{(#o);*iMQ;%#*m%v&-2-+bxgKu1THj6ZUCnzOav7)AQ11ywA^y z_O8^&-jQ?jx!7N6@G$+;Ikg_mYfd!#J;!G^w;#(V?#q7nZRh7FsTcBQ*QEaTww%x2 zk-8o~#-}vqpttq8lQ9rV^&q~c|~oL=C4+( z!jyQG-p6vF_HrAH8D^4(K8EJHuA^Y+y5EdrxA0f-3wiK zKF=VX3h#^d`yp2jt9H4vR1Qt8Qk*MR^1!*oNy!7Z9=7L@>9KGPkhyEWKDw~QG7a>7 zB#!gIHZ#t^7?yc@H6m|C{@Ch6=tp?Vd{1xtI|TZl&}6TBy-56C&quinZ~QQKB{Y7ul1+zc<7aI-U0Paj zlbS6FhE?O|%a{B@x>g|7T#?m`igZ6p^e`Ep)WdX!uuu!DG7~iAN@dw!Fw;|0!Q6PD z7+0K7Oensom=aVq)l#LTtfkC