Skip to content

Commit 4d433ae

Browse files
authored
Fixed Base58 encode prefix (#61)
Signed-off-by: artyom-yurin <[email protected]>
1 parent c67d5c8 commit 4d433ae

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

include/libp2p/multi/multibase_codec.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace libp2p::multi {
3232
BASE16_UPPER = 'F',
3333
BASE32_LOWER = 'b',
3434
BASE32_UPPER = 'B',
35-
BASE58 = 'Z',
35+
BASE58 = 'z',
3636
BASE64 = 'm'
3737
};
3838

src/multi/multibase_codec/multibase_codec_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace {
3333
return MultibaseCodec::Encoding::BASE32_LOWER;
3434
case 'B':
3535
return MultibaseCodec::Encoding::BASE32_UPPER;
36-
case 'Z':
36+
case 'z':
3737
return MultibaseCodec::Encoding::BASE58;
3838
case 'm':
3939
return MultibaseCodec::Encoding::BASE64;

test/libp2p/multi/cid_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ TEST(CidTest, MultibaseStringOfBaseSuccessCIDV1) {
8888
EXPECT_OUTCOME_TRUE(cid_string,
8989
ContentIdentifierCodec::toStringOfBase(
9090
cid, MultibaseCodec::Encoding::BASE58))
91-
ASSERT_EQ(cid_string, "Zb2rhZhLextyrUiNJUcVUR143SaKDPvHxgpGyeB1N1nqdPzfi");
91+
ASSERT_EQ(cid_string, "zb2rhZhLextyrUiNJUcVUR143SaKDPvHxgpGyeB1N1nqdPzfi");
9292
}
9393

9494
/**

test/libp2p/multi/multibase_codec_test.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -295,22 +295,22 @@ class Base58Encoding : public MultibaseCodecTest {
295295
MultibaseCodec::Encoding encoding = MultibaseCodec::Encoding::BASE58;
296296

297297
const std::vector<std::pair<ByteArray, std::string_view>> decode_encode_table{
298-
{"61"_unhex, "Z2g"},
299-
{"626262"_unhex, "Za3gV"},
300-
{"636363"_unhex, "ZaPEr"},
298+
{"61"_unhex, "z2g"},
299+
{"626262"_unhex, "za3gV"},
300+
{"636363"_unhex, "zaPEr"},
301301
{"73696d706c792061206c6f6e6720737472696e67"_unhex,
302-
"Z2cFupjhnEsSn59qHXstmK2ffpLv2"},
302+
"z2cFupjhnEsSn59qHXstmK2ffpLv2"},
303303
{"00eb15231dfceb60925886b67d065299925915aeb172c06647"_unhex,
304-
"Z1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"},
305-
{"516b6fcd0f"_unhex, "ZABnLTmg"},
306-
{"bf4f89001e670274dd"_unhex, "Z3SEo3LWLoPntC"},
307-
{"572e4794"_unhex, "Z3EFU7m"},
308-
{"ecac89cad93923c02321"_unhex, "ZEJDM8drfXA6uyA"},
309-
{"10c8511e"_unhex, "ZRt5zm"},
310-
{"00000000000000000000"_unhex, "Z1111111111"},
304+
"z1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"},
305+
{"516b6fcd0f"_unhex, "zABnLTmg"},
306+
{"bf4f89001e670274dd"_unhex, "z3SEo3LWLoPntC"},
307+
{"572e4794"_unhex, "z3EFU7m"},
308+
{"ecac89cad93923c02321"_unhex, "zEJDM8drfXA6uyA"},
309+
{"10c8511e"_unhex, "zRt5zm"},
310+
{"00000000000000000000"_unhex, "z1111111111"},
311311
{"000111d38e5fc9071ffcd20b4a763cc9ae4f252bb4e"
312312
"48fd66a835e252ada93ff480d6dd43dc62a641155a5"_unhex,
313-
"Z123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"},
313+
"z123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"},
314314
{"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"
315315
"2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f4041"
316316
"42434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162"
@@ -319,7 +319,7 @@ class Base58Encoding : public MultibaseCodecTest {
319319
"a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5"
320320
"c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6"
321321
"e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"_unhex,
322-
"Z1cWB5HCBdLjAuqGGReWE3R3CguuwSjw6RHn39s2yuDRTS5NsBgNiFpWgAnEx6VQi8"
322+
"z1cWB5HCBdLjAuqGGReWE3R3CguuwSjw6RHn39s2yuDRTS5NsBgNiFpWgAnEx6VQi8"
323323
"c"
324324
"sexkgYw3mdYrMHr8x9i7aEwP8kZ7vccXWqKDvGv3u1GxFKPuAkn8JCPPGDMf3vMMnb"
325325
"z"
@@ -368,7 +368,7 @@ TEST_F(Base58Encoding, IncorrectBody) {
368368
* @then decoding succeeds
369369
*/
370370
TEST_F(Base58Encoding, SkipsWhitespacesSuccess) {
371-
constexpr auto base64_with_whitespaces = "Z \t\n\v\f\r 2g \r\f\v\n\t ";
371+
constexpr auto base64_with_whitespaces = "z \t\n\v\f\r 2g \r\f\v\n\t ";
372372
auto decoded_bytes = decodeCorrect(base64_with_whitespaces);
373373

374374
ASSERT_EQ(decoded_bytes, "61"_unhex);
@@ -382,7 +382,7 @@ TEST_F(Base58Encoding, SkipsWhitespacesSuccess) {
382382
* @then decoding fails
383383
*/
384384
TEST_F(Base58Encoding, SkipsWhitespacesFailure) {
385-
constexpr auto base64_with_whitespaces = "Z \t\n\v\f\r skip \r\f\v\n\t a";
385+
constexpr auto base64_with_whitespaces = "z \t\n\v\f\r skip \r\f\v\n\t a";
386386
auto error = multibase->decode(base64_with_whitespaces);
387387

388388
ASSERT_FALSE(error.has_value());

0 commit comments

Comments
 (0)