feat(general): Bump catalyst-ci (#226)

Mr-Leshiy · web-flow · commit b9ef5c31b162 · 2025-02-27T17:00:04.000+02:00
* bump cat-ci ver

* fix rust-toolchain

* fix deny.toml

* get rid of the base64ct fix

* try

* add TryFrom&lt;&amp;[u8]&gt; and TryInto&lt;Vec&lt;u8&gt;&gt; impl for CatalystSignedDocument struct

* update test
diff --git a/Earthfile b/Earthfile
@@ -1,7 +1,7 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.27 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.27 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.3.0 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.3.0 AS cspell-ci
 
 
 FROM debian:stable-slim
diff --git a/docs/Earthfile b/docs/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.27 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.3.0 AS docs-ci
 
 
 IMPORT .. AS repo
diff --git a/docs/src/architecture/08_concepts/catalyst_voting/cddl/Earthfile b/docs/src/architecture/08_concepts/catalyst_voting/cddl/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.27 AS cddl-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.3.0 AS cddl-ci
 
 check-cddl:
     FROM cddl-ci+cddl-base
diff --git a/docs/src/architecture/08_concepts/immutable_ledger/cddl/Earthfile b/docs/src/architecture/08_concepts/immutable_ledger/cddl/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.27 AS cddl-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.3.0 AS cddl-ci
 
 check-cddl:
     FROM cddl-ci+cddl-base
diff --git a/docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile b/docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.27 AS cddl-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.3.0 AS cddl-ci
 
 check-cddl:
     FROM cddl-ci+cddl-base
diff --git a/rust/Earthfile b/rust/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.37 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.3.0 AS rust-ci
 
 COPY_SRC:
     FUNCTION
diff --git a/rust/c509-certificate/Earthfile b/rust/c509-certificate/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.27 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.3.0 AS rust-ci
 
 
 IMPORT .. AS rust-local
diff --git a/rust/catalyst-voting/Cargo.toml b/rust/catalyst-voting/Cargo.toml
@@ -22,8 +22,6 @@ rand_core = { version = "0.6.4", features = ["getrandom"] }
 rand_chacha = "0.3.1"
 curve25519-dalek = { version = "4.1.3", features = ["digest", "rand_core"] }
 ed25519-dalek = { version = "2.1.1", features = ["rand_core"] }
-# Its a transitive dependency which fails to build on higher version with our current compiler 1.83
-base64ct = { version = "=1.6.0" }
 blake2b_simd = "1.0.2"
 rayon = "1.10.0"
 
@@ -33,7 +31,3 @@ proptest = { version = "1.5.0" }
 # Potentially it could be replaced with using `proptest::property_test` attribute macro,
 # after this PR will be merged https://github.com/proptest-rs/proptest/pull/523
 test-strategy = "0.4.0"
-
-[package.metadata.cargo-machete]
-# remove that after fixing issues with latest crates
-ignored = ["base64ct"]
diff --git a/rust/deny.toml b/rust/deny.toml
@@ -58,7 +58,6 @@ allow-git = [
     "https://github.com/txpipe/kes",
     "https://github.com/txpipe/curve25519-dalek",
     "https://github.com/input-output-hk/mithril",
-    "https://github.com/orxfun/orx-pseudo-default",
 ]
 
 [licenses]
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.83"
+channel = "1.85"
 profile = "default"
diff --git a/rust/signed_doc/Cargo.toml b/rust/signed_doc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "catalyst-signed-doc"
-version = "0.0.3"
+version = "0.0.4"
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
diff --git a/rust/signed_doc/src/lib.rs b/rust/signed_doc/src/lib.rs
@@ -258,6 +258,22 @@ impl Encode<()> for CatalystSignedDocument {
     }
 }
 
+impl TryFrom<&[u8]> for CatalystSignedDocument {
+    type Error = anyhow::Error;
+
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(minicbor::decode(value)?)
+    }
+}
+
+impl TryFrom<CatalystSignedDocument> for Vec<u8> {
+    type Error = anyhow::Error;
+
+    fn try_from(value: CatalystSignedDocument) -> Result<Self, Self::Error> {
+        Ok(minicbor::to_vec(value)?)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
@@ -311,8 +327,8 @@ mod tests {
 
         assert!(!doc.problem_report().is_problematic());
 
-        let bytes = minicbor::to_vec(doc).unwrap();
-        let decoded: CatalystSignedDocument = minicbor::decode(bytes.as_slice()).unwrap();
+        let bytes: Vec<u8> = doc.try_into().unwrap();
+        let decoded: CatalystSignedDocument = bytes.as_slice().try_into().unwrap();
 
         assert_eq!(decoded.doc_type().unwrap(), uuid_v4);
         assert_eq!(decoded.doc_id().unwrap(), uuid_v7);

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ allow-git = [`
`58`	`58`	`"https://github.com/txpipe/kes",`
`59`	`59`	`"https://github.com/txpipe/curve25519-dalek",`
`60`	`60`	`"https://github.com/input-output-hk/mithril",`
`61`		`- "https://github.com/orxfun/orx-pseudo-default",`
`62`	`61`	`]`
`63`	`62`
`64`	`63`	`[licenses]`