chore: update go-multibase 🚀
This add supports for base256emoji.
Jorropo committed
Jul 7, 2022 at 21:51 UTC
cbb9aeec499026edf10a625d8f4067dddff43415
5 files changed
+62
-47
core/commands/cid.go
+2
-2
@@ -291,11 +291,11 @@ var basesCmd = &cmds.Command{
291
}
292
switch {
293
case prefixes && numeric:
294
- fmt.Fprintf(w, "%c %5d %s\n", code, v.Code, v.Name)
294
+ fmt.Fprintf(w, "%c %7d %s\n", code, v.Code, v.Name)
295
case prefixes:
296
fmt.Fprintf(w, "%c %s\n", code, v.Name)
297
case numeric:
298
- fmt.Fprintf(w, "%5d %s\n", v.Code, v.Name)
298
+ fmt.Fprintf(w, "%7d %s\n", v.Code, v.Name)
299
default:
300
fmt.Fprintf(w, "%s\n", v.Name)
301
}
go.mod
+1
-1
@@ -86,7 +86,7 @@ require (
86
github.com/mitchellh/go-homedir v1.1.0
87
github.com/multiformats/go-multiaddr v0.5.0
88
github.com/multiformats/go-multiaddr-dns v0.3.1
89
- github.com/multiformats/go-multibase v0.0.3
89
+ github.com/multiformats/go-multibase v0.1.0
90
github.com/multiformats/go-multicodec v0.5.0
91
github.com/multiformats/go-multihash v0.2.0
92
github.com/opentracing/opentracing-go v1.2.0
go.sum
+2
-1
@@ -1253,8 +1253,9 @@ github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysj
1253
github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
1254
github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
1255
github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
1256
-github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
1256
github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
1257
+github.com/multiformats/go-multibase v0.1.0 h1:+cr9718eEwFIUxPP7sQmixYYhD4sRrU9aMXqYb+0diE=
1258
+github.com/multiformats/go-multibase v0.1.0/go.mod h1:ZEjHE+IsUrgp5mhlEAYjMtZwK1k4haNkcaPg9aoe1a8=
1259
github.com/multiformats/go-multicodec v0.2.0/go.mod h1:/y4YVwkfMyry5kFbMTbLJKErhycTIftytRV+llXdyS4=
1260
github.com/multiformats/go-multicodec v0.3.0/go.mod h1:qGGaQmioCDh+TeFOnxrbU0DaIPw8yFgAZgFG0V7p1qQ=
1261
github.com/multiformats/go-multicodec v0.3.1-0.20210902112759-1539a079fd61/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ=
test/sharness/t0290-cid.sh
+35
-22
@@ -81,26 +81,27 @@ test_expect_success "cid format -v 1 -b base58btc works from stdin" '
81
'
82
83
cat <<EOF > bases_expect
84
- 0 identity
85
-0 48 base2
86
-b 98 base32
87
-B 66 base32upper
88
-c 99 base32pad
89
-C 67 base32padupper
90
-f 102 base16
91
-F 70 base16upper
92
-k 107 base36
93
-K 75 base36upper
94
-m 109 base64
95
-M 77 base64pad
96
-t 116 base32hexpad
97
-T 84 base32hexpadupper
98
-u 117 base64url
99
-U 85 base64urlpad
100
-v 118 base32hex
101
-V 86 base32hexupper
102
-z 122 base58btc
103
-Z 90 base58flickr
84
+ 0 identity
85
+0 48 base2
86
+b 98 base32
87
+B 66 base32upper
88
+c 99 base32pad
89
+C 67 base32padupper
90
+f 102 base16
91
+F 70 base16upper
92
+k 107 base36
93
+K 75 base36upper
94
+m 109 base64
95
+M 77 base64pad
96
+t 116 base32hexpad
97
+T 84 base32hexpadupper
98
+u 117 base64url
99
+U 85 base64urlpad
100
+v 118 base32hex
101
+V 86 base32hexupper
102
+z 122 base58btc
103
+Z 90 base58flickr
104
+ 128640 base256emoji
105
EOF
106
107
cat <<EOF > codecs_expect
@@ -234,13 +235,13 @@ cat <<EOF > hashes_expect
235
EOF
236
237
test_expect_success "cid bases" '
237
- cut -c 10- bases_expect > expect &&
238
+ cut -c 12- bases_expect > expect &&
239
ipfs cid bases > actual &&
240
test_cmp expect actual
241
'
242
243
test_expect_success "cid bases --prefix" '
243
- cut -c 1-3,10- bases_expect > expect &&
244
+ cut -c 1-3,12- bases_expect > expect &&
245
ipfs cid bases --prefix > actual &&
246
test_cmp expect actual
247
'
@@ -310,5 +311,17 @@ test_expect_success "cid format --codec fails" '
311
test_cmp actual expected
312
'
313
314
+test_expect_success "cid format -b base256emoji <base32>" '
315
+ echo "🚀🪐⭐💻😅❓💎🌈🌸🌚💰💍🌒😵🐶💁🤐🌎👼🙃🙅☺🌚😞🤤⭐🚀😃✈🌕😚🍻💜🐷⚽✌😊" > expected &&
316
+ ipfs cid format -b base256emoji bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi > actual &&
317
+ test_cmp actual expected
318
+'
319
+
320
+test_expect_success "cid format -b base32 <base256emoji>" '
321
+ echo "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi" > expected &&
322
+ ipfs cid format -b base32 🚀🪐⭐💻😅❓💎🌈🌸🌚💰💍🌒😵🐶💁🤐🌎👼🙃🙅☺🌚😞🤤⭐🚀😃✈🌕😚🍻💜🐷⚽✌😊 > actual &&
323
+ test_cmp actual expected
324
+'
325
+
326
327
test_done
test/sharness/t0295-multibase.sh
+22
-21
@@ -7,31 +7,32 @@ test_description="Test multibase commands"
7
# note: all "ipfs multibase" commands should work without requiring a repo
8
9
cat <<EOF > bases_expect
10
- 0 identity
11
-0 48 base2
12
-b 98 base32
13
-B 66 base32upper
14
-c 99 base32pad
15
-C 67 base32padupper
16
-f 102 base16
17
-F 70 base16upper
18
-k 107 base36
19
-K 75 base36upper
20
-m 109 base64
21
-M 77 base64pad
22
-t 116 base32hexpad
23
-T 84 base32hexpadupper
24
-u 117 base64url
25
-U 85 base64urlpad
26
-v 118 base32hex
27
-V 86 base32hexupper
28
-z 122 base58btc
29
-Z 90 base58flickr
10
+ 0 identity
11
+0 48 base2
12
+b 98 base32
13
+B 66 base32upper
14
+c 99 base32pad
15
+C 67 base32padupper
16
+f 102 base16
17
+F 70 base16upper
18
+k 107 base36
19
+K 75 base36upper
20
+m 109 base64
21
+M 77 base64pad
22
+t 116 base32hexpad
23
+T 84 base32hexpadupper
24
+u 117 base64url
25
+U 85 base64urlpad
26
+v 118 base32hex
27
+V 86 base32hexupper
28
+z 122 base58btc
29
+Z 90 base58flickr
30
+ 128640 base256emoji
31
EOF
32
33
# TODO: expose same cmd under multibase?
34
test_expect_success "multibase list" '
34
- cut -c 10- bases_expect > expect &&
35
+ cut -c 12- bases_expect > expect &&
36
ipfs multibase list > actual &&
37
test_cmp expect actual
38
'