From d89182243a1e4ac066a13ae9c7cfa6dee722d85c Mon Sep 17 00:00:00 2001 From: ra0x3 Date: Mon, 20 Nov 2023 12:46:56 -0500 Subject: [PATCH] fix rebase --- .../indexers/fuel-indexer-test/src/lib.rs | 2 +- .../sway/test-contract1/Forc.lock | 14 +- .../out/debug/test-contract1-abi.json | 142 ++++++++++-------- .../out/debug/test-contract1.bin | Bin 7364 -> 5812 bytes 4 files changed, 87 insertions(+), 71 deletions(-) diff --git a/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs b/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs index 3d8ddd421..41e8aabb6 100644 --- a/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs +++ b/packages/fuel-indexer-tests/indexers/fuel-indexer-test/src/lib.rs @@ -655,7 +655,7 @@ mod fuel_indexer_test { .unwrap(); } } - + fn fuel_indexer_test_predicates( _predicates: Predicates, _inputs: TestPredicate1Inputs, diff --git a/packages/fuel-indexer-tests/sway/test-contract1/Forc.lock b/packages/fuel-indexer-tests/sway/test-contract1/Forc.lock index 142caf994..3248db2ba 100644 --- a/packages/fuel-indexer-tests/sway/test-contract1/Forc.lock +++ b/packages/fuel-indexer-tests/sway/test-contract1/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = "core" -source = "path+from-root-AD80769CAE44474A" +source = "path+from-root-BD9159206068AEC6" [[package]] -name = 'std' -source = 'git+https://github.com/fuellabs/sway?tag=v0.45.0#92dc9f361a9508a940c0d0708130f26fa044f6b3' -dependencies = ['core'] +name = "std" +source = "git+https://github.com/fuellabs/sway?tag=v0.46.1#512a3386f8961185188302f391ccc96553d23a7a" +dependencies = ["core"] [[package]] -name = 'test-contract1' -source = 'member' -dependencies = ['std'] +name = "test-contract1" +source = "member" +dependencies = ["std"] diff --git a/packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1-abi.json b/packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1-abi.json index 7e50dcb21..ce7b2896a 100644 --- a/packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1-abi.json +++ b/packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1-abi.json @@ -12,12 +12,12 @@ "components": [ { "name": "__tuple_element", - "type": 18, + "type": 19, "typeArguments": null }, { "name": "__tuple_element", - "type": 31, + "type": 32, "typeArguments": null } ], @@ -29,7 +29,7 @@ "components": [ { "name": "__tuple_element", - "type": 33, + "type": 34, "typeArguments": null }, { @@ -46,7 +46,7 @@ "components": [ { "name": "__tuple_element", - "type": 34, + "type": 35, "typeArguments": null }, { @@ -68,17 +68,17 @@ "components": [ { "name": "__tuple_element", - "type": 33, + "type": 34, "typeArguments": null }, { "name": "__tuple_element", - "type": 34, + "type": 35, "typeArguments": null }, { "name": "__tuple_element", - "type": 16, + "type": 17, "typeArguments": null } ], @@ -90,7 +90,7 @@ "components": [ { "name": "__array_element", - "type": 35, + "type": 36, "typeArguments": null } ], @@ -114,12 +114,12 @@ "components": [ { "name": "Ping", - "type": 25, + "type": 26, "typeArguments": null }, { "name": "Pung", - "type": 27, + "type": 28, "typeArguments": null }, { @@ -226,25 +226,25 @@ }, { "typeId": 16, - "type": "str[12]", + "type": "str", "components": null, "typeParameters": null }, { "typeId": 17, - "type": "str[32]", + "type": "str[12]", "components": null, "typeParameters": null }, { "typeId": 18, - "type": "str[5]", + "type": "str[32]", "components": null, "typeParameters": null }, { "typeId": 19, - "type": "str[78]", + "type": "str[5]", "components": null, "typeParameters": null }, @@ -290,12 +290,12 @@ "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null }, { "name": "message", - "type": 17, + "type": 18, "typeArguments": null } ], @@ -307,7 +307,7 @@ "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null } ], @@ -315,55 +315,61 @@ }, { "typeId": 25, + "type": "struct Find", + "components": [], + "typeParameters": null + }, + { + "typeId": 26, "type": "struct Ping", "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null }, { "name": "value", - "type": 34, + "type": 35, "typeArguments": null }, { "name": "message", - "type": 17, + "type": 18, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 26, + "typeId": 27, "type": "struct Pong", "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null }, { "name": "value", - "type": 34, + "type": 35, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 27, + "typeId": 28, "type": "struct Pung", "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null }, { "name": "value", - "type": 34, + "type": 35, "typeArguments": null }, { @@ -380,7 +386,7 @@ "typeParameters": null }, { - "typeId": 28, + "typeId": 29, "type": "struct RawVec", "components": [ { @@ -390,7 +396,7 @@ }, { "name": "cap", - "type": 34, + "type": 35, "typeArguments": null } ], @@ -399,19 +405,19 @@ ] }, { - "typeId": 29, + "typeId": 30, "type": "struct SimpleQueryStruct", "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null } ], "typeParameters": null }, { - "typeId": 30, + "typeId": 31, "type": "struct SimpleTupleStruct", "components": [ { @@ -423,12 +429,12 @@ "typeParameters": null }, { - "typeId": 31, + "typeId": 32, "type": "struct TupleStructItem", "components": [ { "name": "id", - "type": 34, + "type": 35, "typeArguments": null }, { @@ -440,12 +446,12 @@ "typeParameters": null }, { - "typeId": 32, + "typeId": 33, "type": "struct Vec", "components": [ { "name": "buf", - "type": 28, + "type": 29, "typeArguments": [ { "name": "", @@ -456,7 +462,7 @@ }, { "name": "len", - "type": 34, + "type": 35, "typeArguments": null } ], @@ -465,19 +471,19 @@ ] }, { - "typeId": 33, + "typeId": 34, "type": "u32", "components": null, "typeParameters": null }, { - "typeId": 34, + "typeId": 35, "type": "u64", "components": null, "typeParameters": null }, { - "typeId": 35, + "typeId": 36, "type": "u8", "components": null, "typeParameters": null @@ -504,7 +510,7 @@ "name": "trigger_callreturn", "output": { "name": "", - "type": 27, + "type": 28, "typeArguments": null }, "attributes": null @@ -514,7 +520,7 @@ "name": "trigger_deeply_nested", "output": { "name": "", - "type": 29, + "type": 30, "typeArguments": null }, "attributes": null @@ -533,7 +539,7 @@ "inputs": [ { "name": "num", - "type": 34, + "type": 35, "typeArguments": null } ], @@ -555,6 +561,16 @@ }, "attributes": null }, + { + "inputs": [], + "name": "trigger_find", + "output": { + "name": "", + "type": 25, + "typeArguments": null + }, + "attributes": null + }, { "inputs": [], "name": "trigger_generics", @@ -564,7 +580,7 @@ "typeArguments": [ { "name": "", - "type": 25, + "type": 26, "typeArguments": null } ] @@ -621,7 +637,7 @@ "name": "trigger_multiargs", "output": { "name": "", - "type": 25, + "type": 26, "typeArguments": null }, "attributes": null @@ -631,7 +647,7 @@ "name": "trigger_panic", "output": { "name": "", - "type": 34, + "type": 35, "typeArguments": null }, "attributes": null @@ -641,7 +657,7 @@ "name": "trigger_ping", "output": { "name": "", - "type": 25, + "type": 26, "typeArguments": null }, "attributes": null @@ -651,7 +667,7 @@ "name": "trigger_ping_for_optional", "output": { "name": "", - "type": 25, + "type": 26, "typeArguments": null }, "attributes": null @@ -661,7 +677,7 @@ "name": "trigger_pong", "output": { "name": "", - "type": 26, + "type": 27, "typeArguments": null }, "attributes": null @@ -739,12 +755,12 @@ { "inputs": [ { - "name": "v", - "type": 32, + "name": "_v", + "type": 33, "typeArguments": [ { "name": "", - "type": 35, + "type": 36, "typeArguments": null } ] @@ -802,7 +818,7 @@ "typeArguments": [ { "name": "", - "type": 25, + "type": 26, "typeArguments": [] } ] @@ -812,11 +828,11 @@ "logId": 4, "loggedType": { "name": "", - "type": 32, + "type": 33, "typeArguments": [ { "name": "", - "type": 25, + "type": 26, "typeArguments": [] } ] @@ -826,7 +842,7 @@ "logId": 5, "loggedType": { "name": "", - "type": 34, + "type": 35, "typeArguments": null } }, @@ -834,7 +850,7 @@ "logId": 6, "loggedType": { "name": "", - "type": 27, + "type": 28, "typeArguments": [] } }, @@ -842,7 +858,7 @@ "logId": 7, "loggedType": { "name": "", - "type": 27, + "type": 28, "typeArguments": [] } }, @@ -850,7 +866,7 @@ "logId": 8, "loggedType": { "name": "", - "type": 26, + "type": 27, "typeArguments": [] } }, @@ -858,7 +874,7 @@ "logId": 9, "loggedType": { "name": "", - "type": 34, + "type": 35, "typeArguments": null } }, @@ -866,7 +882,7 @@ "logId": 10, "loggedType": { "name": "", - "type": 30, + "type": 31, "typeArguments": [] } }, @@ -874,7 +890,7 @@ "logId": 11, "loggedType": { "name": "", - "type": 19, + "type": 16, "typeArguments": null } }, @@ -882,11 +898,11 @@ "logId": 12, "loggedType": { "name": "", - "type": 32, + "type": 33, "typeArguments": [ { "name": "", - "type": 26, + "type": 27, "typeArguments": [] } ] diff --git a/packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1.bin b/packages/fuel-indexer-tests/sway/test-contract1/out/debug/test-contract1.bin index fca1fe78f45ba0d1c77c3d4a48b0d6118ea636f3..51f75fb4287f1f5a8d6738ef4816d0b108c9366b 100644 GIT binary patch literal 5812 zcmd5=ZERat89sKL&S}?jsqM78nWmf6Nw21=auX*D9~Jk`zO%i=#J^bERC?@#4%^G?bxg9v9rdU!Ho9wnhZbq zZ*o={!@R#8RLJ(M*sSnZeuAkXa796q@%LRF^jC0%MIg-C!$d4#O-*)H= z9g-}fThS$w+YY};pZk&96uY|urq2kNjM4v#2J=u{Chxo=tBx89^Zx_k+H=P0g_HAglUu`OxZ^8e!V6>1J>#Kzkn%wv}L} z7%OC}7iXJWa*Tz{S#CSlH({==#cZr_8OAINAx4XF=D}J6Y-nqV`wZR88tO3jQO< z7E57@l{JvNR}rg-o{CpsW1DV;D@vTv{3(ogxNP3B-sXTAsz5K26%0Tp75Rs;&@(TpxBCUi`kQS83u6YzDf zo(fhFnriQ zsvZ0~y4KYx%-3sF0yTlfKI1icdZtd zT(wXa_cA1Op*t$-QWEm^I93Gr7&UOH+9`4x{_e+}r20d;CC*l$FYWCDAJ`ksVtfMQ zC_jr@w}!=hH})xVAKe?&`863ExeQBDz#DpmE2vWuS8b#C^(dx~h3W2#w}#~A${-b zsq0GP-YySw?eUx-y;Wn3^u0yiEz>*6-@aU|T&w5z;C=JwM140Y13Ubo761#XV9fnllo4CX;-`0$h8%(eQm{8VxDiSvDc_a z(sOtdz}J71J*U_0@ltH^!<`KQ(`JkCv67A$3yh6IUztbc6TCK9?bNq@jpI}!a#dk_ zt*E=M9l_mMq?&T;94K>N3!4eA*<8z&4>1RL4=QtjW5lCuOI>UckFtzU8S(i~ zo&y|{%z~6zkTPfGc-G~Q51IqR>*9N}9Oz%S=e9Y3x`X~6{duCS)$Y2A8l)zX17`G@ zdad(l=-F0a^I`eE9g%%^*jd#mf9M_P;C)9Q>T*9*^pp?%pX7`Fk1+DcqM8%+gaa5G zkm;vhPks}0QeCIHmZWb3 zj;WsjAL=I{UzfVQz~B26^J9+pBJjfscpB6jpza&(=uhQ4r18ExRy|7gyWR+!f78TZ za~w9~`vrC>xX&5z!8>?Ee}KG@J+M8?ct4w6*WYGceIxFANZeiOE2(cBM1N~^fQM?l zufH7>{cYS(p|jY_m}17M-nF{kz*h1H{4z-2bL4vkb_T3Qs;{DdMgK+d$Jk4CswEXN zLRNcieG}#eTdd$xM;v;@p+_3^rC;{116V_Us$21jn!&p_3|V47dh9s$rwZa#@1;k9 z(_;*CgS_9yyYgSuMT6XWuRKcMWdAc=BG9G&T{TMIRW4oj!7t{7v50pMxqxpB#0cNb z7>jQV#4luqYU?srd?Htph*3R{8bog312+|CYDPnh6qzrL=+EPLFUtni^x`)c2_ zYU~B3CRSKJiT)z3Q7$zGQX2i;hQINYi?G?FCh?|-^$l{}n>X3rwC18))W0(JEWMHM zDQsWW)^o86aeqktyD!c+u0Hy_Jl-H^@5xIl))}*|^Pk+sJQwo#&5s|ze>GC0 zVpi;Idr8pHcjU>4pz20B_Hp_YRc8KclypP>vHjx{2M!h{4?SL-nx2_`Vs5^)uz2{$ z(PMi$yQ1CHCgJCMJ+DnI6ibu&xr5s5YHL5Sj~y5EjXiRFhoEPs<=8Lm ztNqJ_UW_%#^;;6@7tihD=#B?5Oc)pb1t=+#+(&h^@3&nA5a%#3XF$KFdoSWC?XJ)2%uQC3#M4Kd41l{=& zIlhx<+vl?P67BlO`MpG+eDT6KAHVwaNup1^?Ee+f`!av#`(F)r|AEG*wp^bfdU*8G zd7|gud-*M*_nzL({r%nVy%MMK@n5{n!0HJyp)?dMB~NJ4}Od2Czdbr zb6;J3k?Y$%@D7jH13&xQ_i24Wd+8fQl{b?gCEEJShdxWR{H2~_L>b%4<)h+oJwdsA e&~dRI_=%vwu%!Kxa``CHZ^-dq1P%El4gM3Rj=i7& literal 7364 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 t;PWKyZ|{79Bx4)