refactor: switch from bs58 to multibase for base58

Most projects will already use multibase in their dependency tree, so this should reduce duplication there.
If multibase is not good enough for folks, we should make sure to improve it, so we can include it without worry.

Author: dignifiedquire

Cargo.toml

@@ -14,9 +14,9 @@ default = ["url"]
 
 [dependencies]
 arrayref = "0.3"
-bs58 = "0.4.0"
 byteorder = "1.3.1"
 data-encoding = "2.1"
+multibase = "0.9.1"
 multihash = { version = "0.16", default-features = false, features = ["std", "multihash-impl", "identity"] }
 percent-encoding = "2.1.0"
 serde = "1.0.70"

src/errors.rs

@@ -55,8 +55,8 @@ impl From<multihash::Error> for Error {
     }
 }
 
-impl From<bs58::decode::Error> for Error {
-    fn from(err: bs58::decode::Error) -> Error {
+impl From<multibase::Error> for Error {
+    fn from(err: multibase::Error) -> Error {
         Error::ParsingError(err.into())
     }
 }

src/protocol.rs

@@ -162,7 +162,7 @@ impl<'a> Protocol<'a> {
             }
             "p2p" => {
                 let s = iter.next().ok_or(Error::InvalidProtocolString)?;
-                let decoded = bs58::decode(s).into_vec()?;
+                let decoded = multibase::Base::Base58Btc.decode(s)?;
                 Ok(Protocol::P2p(Multihash::from_bytes(&decoded)?))
             }
             "http" => Ok(Protocol::Http),
@@ -512,7 +512,11 @@ impl<'a> fmt::Display for Protocol<'a> {
                 let s = BASE32.encode(addr.hash());
                 write!(f, "/onion3/{}:{}", s.to_lowercase(), addr.port())
             }
-            P2p(c) => write!(f, "/p2p/{}", bs58::encode(c.to_bytes()).into_string()),
+            P2p(c) => write!(
+                f,
+                "/p2p/{}",
+                multibase::Base::Base58Btc.encode(c.to_bytes())
+            ),
             P2pCircuit => f.write_str("/p2p-circuit"),
             Quic => f.write_str("/quic"),
             Sctp(port) => write!(f, "/sctp/{}", port),

tests/lib.rs

@@ -161,7 +161,7 @@ fn ma_valid(source: &str, target: &str, protocols: Vec<Protocol<'_>>) {
 }
 
 fn multihash(s: &str) -> Multihash {
-    Multihash::from_bytes(&bs58::decode(s).into_vec().unwrap()).unwrap()
+    Multihash::from_bytes(&multibase::Base::Base58Btc.decode(s).unwrap()).unwrap()
 }
 
 #[test]