Skip to content

Commit df83468

Browse files
Mr-LeshiyMr-Leshiy
committed
remove uneeded uuid dep, cleanup API
1 parent d4c9f6a commit df83468

File tree

5 files changed

+42
-46
lines changed

5 files changed

+42
-46
lines changed

‎rust/signed_doc/Cargo.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ workspace = true
1212

1313
[dependencies]
1414
rbac-registration = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250128-01" }
15-
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250128-01" }
15+
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250204-00" }
1616
anyhow = "1.0.95"
1717
serde = { version = "1.0.217", features = ["derive"] }
1818
serde_json = "1.0.134"
1919
coset = "0.3.8"
2020
minicbor = { version = "0.25.1", features = ["half"] }
2121
brotli = "7.0.0"
2222
ed25519-dalek = { version = "2.1.1", features = ["pem", "rand_core"] }
23-
uuid = { version = "1.11.0", features = ["v4", "v7", "serde"] }
2423
hex = "0.4.3"
2524
strum = { version = "0.26.3", features = ["derive"] }
2625
clap = { version = "4.5.23", features = ["derive", "env"] }

‎rust/signed_doc/src/doc_types/mod.rs‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
mod proposal_document;
55

6-
use catalyst_types::uuid::UuidV4;
6+
use catalyst_types::uuid::{Uuid, UuidV4};
77
pub use proposal_document::{ProposalDocument, PROPOSAL_DOCUMENT_UUID_TYPE};
88

99
/// Represents different types of documents.
@@ -44,50 +44,46 @@ pub enum DocumentType {
4444
}
4545

4646
/// Proposal template `UuidV4` type.
47-
const PROPOSAL_TEMPLATE_UUID_TYPE: uuid::Uuid =
48-
uuid::Uuid::from_u128(0x0CE8_AB38_9258_4FBC_A62E_7FAA_6E58_318F);
47+
const PROPOSAL_TEMPLATE_UUID_TYPE: Uuid =
48+
Uuid::from_u128(0x0CE8_AB38_9258_4FBC_A62E_7FAA_6E58_318F);
4949
/// Comment document `UuidV4` type.
50-
const COMMENT_DOCUMENT_UUID_TYPE: uuid::Uuid =
51-
uuid::Uuid::from_u128(0xB679_DED3_0E7C_41BA_89F8_DA62_A178_98EA);
50+
const COMMENT_DOCUMENT_UUID_TYPE: Uuid = Uuid::from_u128(0xB679_DED3_0E7C_41BA_89F8_DA62_A178_98EA);
5251
/// Comment template `UuidV4` type.
53-
const COMMENT_TEMPLATE_UUID_TYPE: uuid::Uuid =
54-
uuid::Uuid::from_u128(0x0B84_24D4_EBFD_46E3_9577_1775_A69D_290C);
52+
const COMMENT_TEMPLATE_UUID_TYPE: Uuid = Uuid::from_u128(0x0B84_24D4_EBFD_46E3_9577_1775_A69D_290C);
5553
/// Review document `UuidV4` type.
56-
const REVIEW_DOCUMENT_UUID_TYPE: uuid::Uuid =
57-
uuid::Uuid::from_u128(0xE4CA_F5F0_098B_45FD_94F3_0702_A457_3DB5);
54+
const REVIEW_DOCUMENT_UUID_TYPE: Uuid = Uuid::from_u128(0xE4CA_F5F0_098B_45FD_94F3_0702_A457_3DB5);
5855
/// Review template `UuidV4` type.
59-
const REVIEW_TEMPLATE_UUID_TYPE: uuid::Uuid =
60-
uuid::Uuid::from_u128(0xEBE5_D0BF_5D86_4577_AF4D_008F_DDBE_2EDC);
56+
const REVIEW_TEMPLATE_UUID_TYPE: Uuid = Uuid::from_u128(0xEBE5_D0BF_5D86_4577_AF4D_008F_DDBE_2EDC);
6157
/// Category parameters document `UuidV4` type.
62-
const CATEGORY_PARAMETERS_DOCUMENT_UUID_TYPE: uuid::Uuid =
63-
uuid::Uuid::from_u128(0x48C2_0109_362A_4D32_9BBA_E0A9_CF8B_45BE);
58+
const CATEGORY_PARAMETERS_DOCUMENT_UUID_TYPE: Uuid =
59+
Uuid::from_u128(0x48C2_0109_362A_4D32_9BBA_E0A9_CF8B_45BE);
6460
/// Category parameters template `UuidV4` type.
65-
const CATEGORY_PARAMETERS_TEMPLATE_UUID_TYPE: uuid::Uuid =
66-
uuid::Uuid::from_u128(0x65B1_E8B0_51F1_46A5_9970_72CD_F268_84BE);
61+
const CATEGORY_PARAMETERS_TEMPLATE_UUID_TYPE: Uuid =
62+
Uuid::from_u128(0x65B1_E8B0_51F1_46A5_9970_72CD_F268_84BE);
6763
/// Campaign parameters document `UuidV4` type.
68-
const CAMPAIGN_PARAMETERS_DOCUMENT_UUID_TYPE: uuid::Uuid =
69-
uuid::Uuid::from_u128(0x0110_EA96_A555_47CE_8408_36EF_E6ED_6F7C);
64+
const CAMPAIGN_PARAMETERS_DOCUMENT_UUID_TYPE: Uuid =
65+
Uuid::from_u128(0x0110_EA96_A555_47CE_8408_36EF_E6ED_6F7C);
7066
/// Campaign parameters template `UuidV4` type.
71-
const CAMPAIGN_PARAMETERS_TEMPLATE_UUID_TYPE: uuid::Uuid =
72-
uuid::Uuid::from_u128(0x7E8F_5FA2_44CE_49C8_BFD5_02AF_42C1_79A3);
67+
const CAMPAIGN_PARAMETERS_TEMPLATE_UUID_TYPE: Uuid =
68+
Uuid::from_u128(0x7E8F_5FA2_44CE_49C8_BFD5_02AF_42C1_79A3);
7369
/// Brand parameters document `UuidV4` type.
74-
const BRAND_PARAMETERS_DOCUMENT_UUID_TYPE: uuid::Uuid =
75-
uuid::Uuid::from_u128(0x3E48_08CC_C86E_467B_9702_D60B_AA9D_1FCA);
70+
const BRAND_PARAMETERS_DOCUMENT_UUID_TYPE: Uuid =
71+
Uuid::from_u128(0x3E48_08CC_C86E_467B_9702_D60B_AA9D_1FCA);
7672
/// Brand parameters template `UuidV4` type.
77-
const BRAND_PARAMETERS_TEMPLATE_UUID_TYPE: uuid::Uuid =
78-
uuid::Uuid::from_u128(0xFD3C_1735_80B1_4EEA_8D63_5F43_6D97_EA31);
73+
const BRAND_PARAMETERS_TEMPLATE_UUID_TYPE: Uuid =
74+
Uuid::from_u128(0xFD3C_1735_80B1_4EEA_8D63_5F43_6D97_EA31);
7975
/// Proposal action document `UuidV4` type.
80-
const PROPOSAL_ACTION_DOCUMENT_UUID_TYPE: uuid::Uuid =
81-
uuid::Uuid::from_u128(0x5E60_E623_AD02_4A1B_A1AC_406D_B978_EE48);
76+
const PROPOSAL_ACTION_DOCUMENT_UUID_TYPE: Uuid =
77+
Uuid::from_u128(0x5E60_E623_AD02_4A1B_A1AC_406D_B978_EE48);
8278
/// Public vote transaction v2 `UuidV4` type.
83-
const PUBLIC_VOTE_TX_V2_UUID_TYPE: uuid::Uuid =
84-
uuid::Uuid::from_u128(0x8DE5_586C_E998_4B95_8742_7BE3_C859_2803);
79+
const PUBLIC_VOTE_TX_V2_UUID_TYPE: Uuid =
80+
Uuid::from_u128(0x8DE5_586C_E998_4B95_8742_7BE3_C859_2803);
8581
/// Private vote transaction v2 `UuidV4` type.
86-
const PRIVATE_VOTE_TX_V2_UUID_TYPE: uuid::Uuid =
87-
uuid::Uuid::from_u128(0xE78E_E18D_F380_44C1_A852_80AA_6ECB_07FE);
82+
const PRIVATE_VOTE_TX_V2_UUID_TYPE: Uuid =
83+
Uuid::from_u128(0xE78E_E18D_F380_44C1_A852_80AA_6ECB_07FE);
8884
/// Immutable ledger block `UuidV4` type.
89-
const IMMUTABLE_LEDGER_BLOCK_UUID_TYPE: uuid::Uuid =
90-
uuid::Uuid::from_u128(0xD9E7_E6CE_2401_4D7D_9492_F4F7_C642_41C3);
85+
const IMMUTABLE_LEDGER_BLOCK_UUID_TYPE: Uuid =
86+
Uuid::from_u128(0xD9E7_E6CE_2401_4D7D_9492_F4F7_C642_41C3);
9187

9288
impl TryFrom<UuidV4> for DocumentType {
9389
type Error = anyhow::Error;

‎rust/signed_doc/src/doc_types/proposal_document.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//! Proposal Document object implementation
22
//! <https://input-output-hk.github.io/catalyst-libs/architecture/08_concepts/catalyst_docs/proposal/#proposal-document>
33
4-
use catalyst_types::problem_report::ProblemReport;
4+
use catalyst_types::{problem_report::ProblemReport, uuid::Uuid};
55

66
use crate::{error::CatalystSignedDocError, CatalystSignedDocument};
77

88
/// Proposal document `UuidV4` type.
9-
pub const PROPOSAL_DOCUMENT_UUID_TYPE: uuid::Uuid =
10-
uuid::Uuid::from_u128(0x7808_D2BA_D511_40AF_84E8_C0D1_625F_DFDC);
9+
pub const PROPOSAL_DOCUMENT_UUID_TYPE: Uuid =
10+
Uuid::from_u128(0x7808_D2BA_D511_40AF_84E8_C0D1_625F_DFDC);
1111

1212
/// Proposal Document struct
1313
pub struct ProposalDocument {

‎rust/signed_doc/src/lib.rs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ use std::{
1717

1818
pub use builder::Builder;
1919
use catalyst_types::problem_report::ProblemReport;
20-
pub use catalyst_types::uuid::{UuidV4, UuidV7};
20+
pub use catalyst_types::uuid::{Uuid, UuidV4, UuidV7};
2121
pub use content::Content;
2222
use coset::{CborSerializable, Header};
2323
use error::CatalystSignedDocError;
2424
pub use metadata::{DocumentRef, ExtraFields, Metadata};
25-
pub use minicbor::{decode, encode, Decode, Decoder, Encode};
25+
pub use minicbor::{decode, encode, Decode, Decoder, Encode, Encoder};
2626
pub use rbac_registration::cardano::cip509::SimplePublicKeyType;
2727
pub use signature::{IdUri, Signatures};
2828
use utils::context::DecodeSignDocCtx;
@@ -106,7 +106,7 @@ impl CatalystSignedDocument {
106106

107107
/// Return a Document's signatures
108108
#[must_use]
109-
pub fn signatures(&self) -> &Signatures {
109+
pub(crate) fn signatures(&self) -> &Signatures {
110110
&self.inner.signatures
111111
}
112112

@@ -119,12 +119,7 @@ impl CatalystSignedDocument {
119119
/// Return a list of Document's author IDs (short form of Catalyst IDs).
120120
#[must_use]
121121
pub fn authors(&self) -> Vec<IdUri> {
122-
self.inner
123-
.signatures
124-
.kids()
125-
.into_iter()
126-
.map(|k| k.as_short_id())
127-
.collect()
122+
self.inner.signatures.authors()
128123
}
129124

130125
/// Verify document signatures.

‎rust/signed_doc/src/signature/mod.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ impl Signatures {
2525
Self(Vec::new())
2626
}
2727

28-
/// List of signature Key IDs.
28+
/// Return a list of author IDs (short form of Catalyst IDs).
29+
#[must_use]
30+
pub fn authors(&self) -> Vec<IdUri> {
31+
self.kids().into_iter().map(|k| k.as_short_id()).collect()
32+
}
33+
34+
/// Return a list of Document's Catalyst IDs.
2935
#[must_use]
3036
pub fn kids(&self) -> Vec<IdUri> {
3137
self.0.iter().map(|sig| sig.kid.clone()).collect()

0 commit comments

Comments
 (0)