From cbb9aeec499026edf10a625d8f4067dddff43415 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Thu, 7 Jul 2022 21:51:19 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20update=20go-multibase=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This add supports for base256emoji. --- core/commands/cid.go | 4 +-- go.mod | 2 +- go.sum | 3 +- test/sharness/t0290-cid.sh | 57 ++++++++++++++++++++------------ test/sharness/t0295-multibase.sh | 43 ++++++++++++------------ 5 files changed, 62 insertions(+), 47 deletions(-) diff --git a/core/commands/cid.go b/core/commands/cid.go index f3c3e6080..0cf0e9dc0 100644 --- a/core/commands/cid.go +++ b/core/commands/cid.go @@ -291,11 +291,11 @@ var basesCmd = &cmds.Command{ } switch { case prefixes && numeric: - fmt.Fprintf(w, "%c %5d %s\n", code, v.Code, v.Name) + fmt.Fprintf(w, "%c %7d %s\n", code, v.Code, v.Name) case prefixes: fmt.Fprintf(w, "%c %s\n", code, v.Name) case numeric: - fmt.Fprintf(w, "%5d %s\n", v.Code, v.Name) + fmt.Fprintf(w, "%7d %s\n", v.Code, v.Name) default: fmt.Fprintf(w, "%s\n", v.Name) } diff --git a/go.mod b/go.mod index 60cc216b3..52af87799 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/multiformats/go-multiaddr v0.5.0 github.com/multiformats/go-multiaddr-dns v0.3.1 - github.com/multiformats/go-multibase v0.0.3 + github.com/multiformats/go-multibase v0.1.0 github.com/multiformats/go-multicodec v0.5.0 github.com/multiformats/go-multihash v0.2.0 github.com/opentracing/opentracing-go v1.2.0 diff --git a/go.sum b/go.sum index 0d700aec2..0e7d805f5 100644 --- a/go.sum +++ b/go.sum @@ -1253,8 +1253,9 @@ github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysj github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA= github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA= github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs= -github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= +github.com/multiformats/go-multibase v0.1.0 h1:+cr9718eEwFIUxPP7sQmixYYhD4sRrU9aMXqYb+0diE= +github.com/multiformats/go-multibase v0.1.0/go.mod h1:ZEjHE+IsUrgp5mhlEAYjMtZwK1k4haNkcaPg9aoe1a8= github.com/multiformats/go-multicodec v0.2.0/go.mod h1:/y4YVwkfMyry5kFbMTbLJKErhycTIftytRV+llXdyS4= github.com/multiformats/go-multicodec v0.3.0/go.mod h1:qGGaQmioCDh+TeFOnxrbU0DaIPw8yFgAZgFG0V7p1qQ= github.com/multiformats/go-multicodec v0.3.1-0.20210902112759-1539a079fd61/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ= diff --git a/test/sharness/t0290-cid.sh b/test/sharness/t0290-cid.sh index 7f0e0e181..64e09777c 100755 --- a/test/sharness/t0290-cid.sh +++ b/test/sharness/t0290-cid.sh @@ -81,26 +81,27 @@ test_expect_success "cid format -v 1 -b base58btc works from stdin" ' ' cat < bases_expect - 0 identity -0 48 base2 -b 98 base32 -B 66 base32upper -c 99 base32pad -C 67 base32padupper -f 102 base16 -F 70 base16upper -k 107 base36 -K 75 base36upper -m 109 base64 -M 77 base64pad -t 116 base32hexpad -T 84 base32hexpadupper -u 117 base64url -U 85 base64urlpad -v 118 base32hex -V 86 base32hexupper -z 122 base58btc -Z 90 base58flickr + 0 identity +0 48 base2 +b 98 base32 +B 66 base32upper +c 99 base32pad +C 67 base32padupper +f 102 base16 +F 70 base16upper +k 107 base36 +K 75 base36upper +m 109 base64 +M 77 base64pad +t 116 base32hexpad +T 84 base32hexpadupper +u 117 base64url +U 85 base64urlpad +v 118 base32hex +V 86 base32hexupper +z 122 base58btc +Z 90 base58flickr + 128640 base256emoji EOF cat < codecs_expect @@ -234,13 +235,13 @@ cat < hashes_expect EOF test_expect_success "cid bases" ' - cut -c 10- bases_expect > expect && + cut -c 12- bases_expect > expect && ipfs cid bases > actual && test_cmp expect actual ' test_expect_success "cid bases --prefix" ' - cut -c 1-3,10- bases_expect > expect && + cut -c 1-3,12- bases_expect > expect && ipfs cid bases --prefix > actual && test_cmp expect actual ' @@ -310,5 +311,17 @@ test_expect_success "cid format --codec fails" ' test_cmp actual expected ' +test_expect_success "cid format -b base256emoji " ' + echo "πŸš€πŸͺβ­πŸ’»πŸ˜…β“πŸ’ŽπŸŒˆπŸŒΈπŸŒšπŸ’°πŸ’πŸŒ’πŸ˜΅πŸΆπŸ’πŸ€πŸŒŽπŸ‘ΌπŸ™ƒπŸ™…β˜ΊπŸŒšπŸ˜žπŸ€€β­πŸš€πŸ˜ƒβœˆπŸŒ•πŸ˜šπŸ»πŸ’œπŸ·βš½βœŒπŸ˜Š" > expected && + ipfs cid format -b base256emoji bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi > actual && + test_cmp actual expected +' + +test_expect_success "cid format -b base32 " ' + echo "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi" > expected && + ipfs cid format -b base32 πŸš€πŸͺβ­πŸ’»πŸ˜…β“πŸ’ŽπŸŒˆπŸŒΈπŸŒšπŸ’°πŸ’πŸŒ’πŸ˜΅πŸΆπŸ’πŸ€πŸŒŽπŸ‘ΌπŸ™ƒπŸ™…β˜ΊπŸŒšπŸ˜žπŸ€€β­πŸš€πŸ˜ƒβœˆπŸŒ•πŸ˜šπŸ»πŸ’œπŸ·βš½βœŒπŸ˜Š > actual && + test_cmp actual expected +' + test_done diff --git a/test/sharness/t0295-multibase.sh b/test/sharness/t0295-multibase.sh index da59b41f5..76d3a09f7 100755 --- a/test/sharness/t0295-multibase.sh +++ b/test/sharness/t0295-multibase.sh @@ -7,31 +7,32 @@ test_description="Test multibase commands" # note: all "ipfs multibase" commands should work without requiring a repo cat < bases_expect - 0 identity -0 48 base2 -b 98 base32 -B 66 base32upper -c 99 base32pad -C 67 base32padupper -f 102 base16 -F 70 base16upper -k 107 base36 -K 75 base36upper -m 109 base64 -M 77 base64pad -t 116 base32hexpad -T 84 base32hexpadupper -u 117 base64url -U 85 base64urlpad -v 118 base32hex -V 86 base32hexupper -z 122 base58btc -Z 90 base58flickr + 0 identity +0 48 base2 +b 98 base32 +B 66 base32upper +c 99 base32pad +C 67 base32padupper +f 102 base16 +F 70 base16upper +k 107 base36 +K 75 base36upper +m 109 base64 +M 77 base64pad +t 116 base32hexpad +T 84 base32hexpadupper +u 117 base64url +U 85 base64urlpad +v 118 base32hex +V 86 base32hexupper +z 122 base58btc +Z 90 base58flickr + 128640 base256emoji EOF # TODO: expose same cmd under multibase? test_expect_success "multibase list" ' - cut -c 10- bases_expect > expect && + cut -c 12- bases_expect > expect && ipfs multibase list > actual && test_cmp expect actual '