Merge branch 'main' into rbac-registration-improvements

input-output-hk · Jan 23, 2025 · 5d67b68 · 5d67b68
2 parents 81eec3d + eaf071e
commit 5d67b68
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/rust/cardano-blockchain-types/src/cip134_uri.rs b/rust/cardano-blockchain-types/src/cip134_uri.rs
@@ -8,7 +8,7 @@ use std::fmt::{Display, Formatter};
 use anyhow::{anyhow, Context, Error, Result};
 use pallas::ledger::addresses::Address;
 
-/// An URI in the CIP-0134 format.
+/// A URI in the CIP-0134 format.
 ///
 /// See the [proposal] for more details.
 ///

diff --git a/rust/cardano-blockchain-types/src/lib.rs b/rust/cardano-blockchain-types/src/lib.rs
@@ -1,6 +1,7 @@
 //! Catalyst Enhanced `MultiEraBlock` Structures
 
 mod auxdata;
+mod cip134_uri;
 mod fork;
 mod metadata;
 mod multi_era_block_data;

diff --git a/rust/cardano-blockchain-types/src/slot.rs b/rust/cardano-blockchain-types/src/slot.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Default, Serialize)]
 
-/// Slot on the blockchain, typically one slot equals one second.  However chain
+/// Slot on the blockchain, typically one slot equals one second. However chain
 /// parameters can alter how long a slot is.
 pub struct Slot(u64);
 

diff --git a/rust/catalyst-types/Cargo.toml b/rust/catalyst-types/Cargo.toml
@@ -23,7 +23,7 @@ fluent-uri = "0.3.2"
 hex = "0.4.3"
 minicbor = { version = "0.25.1", features = ["std"] }
 num-traits = "0.2.19"
-orx-concurrent-vec = "3.1.0"
+orx-concurrent-vec = { version = "3.2.0", features = ["serde"] }
 pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 serde = { version = "1.0.217", features = ["derive", "rc"] }
 thiserror = "2.0.9"

diff --git a/rust/catalyst-types/src/problem_report.rs b/rust/catalyst-types/src/problem_report.rs
@@ -7,7 +7,7 @@
 use std::sync::Arc;
 
 use orx_concurrent_vec::ConcurrentVec;
-use serde::{ser::SerializeSeq, Serialize};
+use serde::Serialize;
 
 /// The kind of problem being reported
 #[derive(Debug, Serialize, Clone)]
@@ -82,20 +82,9 @@ struct Entry {
 }
 
 /// The Problem Report list
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize)]
 struct Report(ConcurrentVec<Entry>);
 
-impl Serialize for Report {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where S: serde::Serializer {
-        let mut seq = serializer.serialize_seq(Some(self.0.len()))?;
-        for e in self.0.iter_cloned() {
-            seq.serialize_element(&e)?;
-        }
-        seq.end()
-    }
-}
-
 /// An inner state of the report.
 #[derive(Debug, Serialize)]
 struct State {