From a462b4d0ff063af6aa7c8f2ac6da2cfcf0605f90 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 26 Jul 2023 10:33:11 +0200 Subject: [PATCH] feat: CAR order and dups parameters from IPIP-412 (#87) --- Makefile | 2 +- fixtures/trustless_gateway_car/README.md | 29 +++ .../dir-with-duplicate-files.car | Bin 0 -> 1939 bytes go.mod | 6 +- go.sum | 11 +- tests/trustless_gateway_car_test.go | 172 +++++++++++++++++- tooling/ipns/record.go | 31 +++- tooling/specs/specs.go | 32 ++-- 8 files changed, 247 insertions(+), 36 deletions(-) create mode 100644 fixtures/trustless_gateway_car/dir-with-duplicate-files.car diff --git a/Makefile b/Makefile index 2f98ec76d..55300d517 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ provision-cargateway: ./fixtures.car car -c ./fixtures.car & provision-kubo: - find ./fixtures -name '*.car' -exec ipfs dag import {} \; + find ./fixtures -name '*.car' -exec ipfs dag import --stats --pin-roots=false {} \; find ./fixtures -name '*.ipns-record' -exec sh -c 'ipfs routing put --allow-offline /ipns/$$(basename -s .ipns-record "{}") "{}"' \; # tools diff --git a/fixtures/trustless_gateway_car/README.md b/fixtures/trustless_gateway_car/README.md index f60da5f32..f8f8f813c 100644 --- a/fixtures/trustless_gateway_car/README.md +++ b/fixtures/trustless_gateway_car/README.md @@ -16,4 +16,33 @@ ipfs dag export $CID > file-3k-and-3-blocks.car REMOVE_BLOCK=$(ipfs dag get $CID | jq '.Links[1].Hash["/"]' -r) echo $REMOVE_BLOCK | car filter --version 1 --inverse ./file-3k-and-3-blocks.car ./file-3k-and-3-blocks-missing-block.car ipfs pin rm $CID; ipfs repo gc +# First and third outputted CIDs are used in the missing blocks tests. +ipfs dag get $CID | jq .Links | jq -r '.[].Hash."/"' +``` + +### [dir-with-duplicate-files.car](./dir-with-duplicate-files.car) + +```sh +ipfs version +# ipfs version 0.21.0 +TEXT=$(cat <<-EOF +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non imperdiet nunc. Proin ac quam ut nibh eleifend aliquet. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Sed ligula dolor, imperdiet sagittis arcu et, semper tincidunt urna. Donec et tempor augue, quis sollicitudin metus. Curabitur semper ullamcorper aliquet. Mauris hendrerit sodales lectus eget fermentum. Proin sollicitudin vestibulum commodo. Vivamus nec lectus eu augue aliquet dignissim nec condimentum justo. In hac habitasse platea dictumst. Mauris vel sem neque. + +Vivamus finibus, enim at lacinia semper, arcu erat gravida lacus, sit amet gravida magna orci sit amet est. Sed non leo lacus. Nullam viverra ipsum a tincidunt dapibus. Nulla pulvinar ligula sit amet ante ultrices tempus. Proin purus urna, semper sed lobortis quis, gravida vitae ipsum. Aliquam mi urna, pulvinar eu bibendum quis, convallis ac dolor. In gravida justo sed risus ullamcorper, vitae luctus massa hendrerit. Pellentesque habitant amet. +EOF +) + +ASCII_CID=$(echo "hello application/vnd.ipld.car" | ipfs add --cid-version=1 -q) +HELLO_CID=$(echo "hello world" | ipfs add --cid-version=1 -q) +MULTIBLOCK_CID=$(echo -n $TEXT | ipfs add --cid-version=1 --chunker=size-256 -q) +# Print the Multiblock CIDs (required for some tests) +ipfs dag get $MULTIBLOCK_CID | jq .Links | jq -r '.[].Hash."/"' +ipfs files mkdir -p --cid-version 1 /dir-with-duplicate-files +ipfs files cp /ipfs/$ASCII_CID /dir-with-duplicate-files/ascii-copy.txt +ipfs files cp /ipfs/$ASCII_CID /dir-with-duplicate-files/ascii.txt +ipfs files cp /ipfs/$HELLO_CID /dir-with-duplicate-files/hello.txt +ipfs files cp /ipfs/$MULTIBLOCK_CID /dir-with-duplicate-files/multiblock.txt +ipfs files ls -l +# Manually CID of "dir-with-duplicate-files" and then... +ipfs dag export $CID ``` diff --git a/fixtures/trustless_gateway_car/dir-with-duplicate-files.car b/fixtures/trustless_gateway_car/dir-with-duplicate-files.car new file mode 100644 index 0000000000000000000000000000000000000000..d0accae1597921dc5f64832b872382a3af23c2bb GIT binary patch literal 1939 zcma)7ZERFU6m8cgwreeBsi95LPOKVJ*Vkeb6=`Uot;MuhqG=@>iL>)&w^L@`yw1mh z7;UMVnwTgW6-k4N@J9`ipy7u_BK}cHiUB2jXt2RlH1Qh~h!F73zTKAo+9sRqX6AmJ zd(OGD_rFJ#ltynp(YW@ulF~4N&a@8q*P^oVW>PXHSq(dYcw>jlZ&aE9-8q>Av1Oa&WTo=Fcy_ zaCF;_*LHO!Dh4R$GM7}DSPGqB^e;NzZTon)H+875p}hLQ^P+9>9eZMB)&JFB866~d zZ`zWm5|$g5;*zY-WuC8y$I46F=QCff9l~MA8NmklYsv<`$3pIV1gm(nt5FPeRAYlw z+>dX|v0oJNoe_uI*T24cPg`qKr@!{{sn5i^C#J`D?mO}Gp~sgW8}D2G@WMn%%}6Yf z55ClJxNK@k?3wiG6?^%DOP};L-22fVy=TwAdDGdh_D_ea=LCOuf%Wswo$Uv%oUR+b zr~TSvwZHqTHtc)gmzLeXj=a^oV@`1Qx^GtAxbla(#jj3&`OhsAXI?&4cX3SoRQdIy zjW3EnJC{bmjS=R(Z~s_%_>JCY_m@|yw(WnlHe7cuc6{rF?>in_bo9uQsplX#7GGE% zs~IgvBeB^}Y*);YS#0DUsi;6K)K(y0a;cDJ24O)>5)m0_N(?ntA?&k|fi;5+qMR8I zJ!Aud0vRACLaKa54GQ4MLu-^|0m1|gSuBu+W0o3#B+Ak>@Db*0$WkcKPc@jxa%hYL zL-QCy#RSs`Dx|R`aIcY6gduK;f#1*tyr&qU8ii6@swg5h#W=(8tuS4N9-%(sEMqy2 z21;IqP~!|U2I^x)EEG$kh^1m$YwCtXh6RNAHUJPRz#i(50VNKTfqS41+l-}27#uoi z$-(2ySRZBqI<59lJ0MKK5s(}ew47r>q;kb)h*^!Tf&v4;mZA#O(9*{o2Ie4!;~)ba z(^Lr>7%K{d&*_()<(5bxq%VPQmc;_n9ppkK8$mAgMn1~~Olu}`QJ}xia$O>pikV!X zL8}e4dN4o(V1NNPEY_N$kYhtZ4+aAW4dUl#%u?>CfNtOkFCH&oOfxWz)k#DHz=93p z7_0{xN4zET`YE`{D4bYfinS)JT!9$?07k!IRA1gqh#l4rw7V1c-$4v zI}%?dyN^SMD<6qM%d;%ND(|<5rDEGX3o&Q=89O@