use re-exports from multikey

Author: DougAnderson444

Cargo.toml

@@ -13,13 +13,7 @@ default = ["serde"]
 dag_cbor = ["serde_cbor", "serde_cbor/tags"]
 
 [dependencies]
-multibase = { version = "1.0", git = "https://github.com/cryptidtech/rust-multibase.git" }
-multicodec = { version = "1.0", git = "https://github.com/cryptidtech/rust-multicodec.git" }
-multihash = { version = "1.0", git = "https://github.com/DougAnderson444/multihash.git", branch = "hash-impl" }
 multikey = { version = "1.0", git = "https://github.com/DougAnderson444/multikey.git", branch = "deps" }
-multisig = { version = "1.0", git = "https://github.com/DougAnderson444/multisig.git" }
-multitrait = { version = "1.0", git = "https://github.com/cryptidtech/multitrait.git" }
-multiutil = { version = "1.0", git = "https://github.com/cryptidtech/multiutil.git" }
 rand = "0.8"
 serde = { version = "1.0", default-features = false, features = [
   "alloc",

src/cid.rs

@@ -1,4 +1,5 @@
 // SPDX-License-Idnetifier: Apache-2.0
+use super::*;
 use crate::{error::CidError, Error};
 use core::fmt;
 use multibase::Base;

src/error.rs

@@ -1,4 +1,5 @@
 // SPDX-License-Idnetifier: Apache-2.0
+use super::*;
 
 /// Errors created by this library
 #[derive(Clone, Debug, thiserror::Error)]

src/lib.rs

@@ -33,3 +33,7 @@ pub mod prelude {
     pub use multicodec::Codec;
     pub use multiutil::BaseEncoded;
 }
+
+// Re-export all multi* crates to avoid dependency conflicts
+//pub use multicrates::{multibase, multicodec, multihash, multisig, multitrait, multiutil};
+pub use multikey::multicrates::*;

src/serde/de.rs

@@ -1,11 +1,13 @@
 // SPDX-License-Idnetifier: Apache-2.0
+use super::{multicodec, multihash};
 use crate::{vlad, Cid, Vlad};
+
 use core::fmt;
 use multicodec::Codec;
 use multihash::Multihash;
-use multikey::Nonce;
 #[cfg(feature = "dag_cbor")]
-use multitrait::TryDecodeFrom;
+use multikey::multicrates::multitrait::TryDecodeFrom;
+use multikey::Nonce;
 use serde::{
     de::{Error, MapAccess, Visitor},
     Deserialize, Deserializer,

src/serde/mod.rs

@@ -3,9 +3,15 @@
 mod de;
 mod ser;
 
+use super::*;
+
 #[cfg(test)]
 mod tests {
-    use crate::{cid, vlad};
+    use super::*;
+    use crate::{
+        cid::{self, Cid, EncodedCid},
+        vlad::{self, EncodedVlad, Vlad},
+    };
     use multicodec::Codec;
     use multihash::mh;
     use multikey::nonce;
@@ -427,13 +433,13 @@ mod tests {
 
     #[test]
     fn test_null_cid_serde_compact() {
-        let c = cid::Cid::null();
+        let c = Cid::null();
         assert_tokens(&c.compact(), &[Token::BorrowedBytes(&[1, 0, 0, 0])]);
     }
 
     #[test]
     fn test_null_cid_serde_readable() {
-        let c = cid::Cid::null();
+        let c = Cid::null();
         assert_tokens(
             &c.readable(),
             &[
@@ -462,13 +468,13 @@ mod tests {
 
     #[test]
     fn test_encoded_null_cid_serde_readable() {
-        let c: cid::EncodedCid = cid::Cid::null().into();
+        let c: EncodedCid = Cid::null().into();
         assert_tokens(&c.readable(), &[Token::BorrowedStr("z2UzHM")]);
     }
 
     #[test]
     fn test_null_vlad_serde_compact() {
-        let v = vlad::Vlad::null();
+        let v = Vlad::null();
         assert_tokens(
             &v.compact(),
             &[Token::BorrowedBytes(&[135, 36, 187, 36, 0, 1, 0, 0, 0])],
@@ -477,7 +483,7 @@ mod tests {
 
     #[test]
     fn test_null_vlad_serde_readable() {
-        let v = vlad::Vlad::null();
+        let v = Vlad::null();
         assert_tokens(
             &v.readable(),
             &[
@@ -520,7 +526,7 @@ mod tests {
 
     #[test]
     fn test_encoded_null_vlad_serde_readable() {
-        let v: vlad::EncodedVlad = vlad::Vlad::null().into();
+        let v: EncodedVlad = Vlad::null().into();
         assert_tokens(&v.readable(), &[Token::BorrowedStr("bq4slwjaaaeaaaaa")]);
     }
 }

src/serde/ser.rs

@@ -17,8 +17,8 @@ impl ser::Serialize for Cid {
         } else {
             #[cfg(feature = "dag_cbor")]
             {
-                use multicodec::Codec;
-              
+                use multikey::multicrates::multicodec::Codec;
+
                 // build the byte string for DAG-CBOR according to the spec
                 // https://github.com/ipld/specs/blob/master/block-layer/codecs/dag-cbor.md#links
                 let mut v = Vec::new();

src/vlad.rs

@@ -1,5 +1,7 @@
 // SPDX-License-Idnetifier: Apache-2.0
+use super::*;
 use crate::{error::VladError, Cid, Error};
+
 use core::fmt;
 use multibase::Base;
 use multicodec::Codec;