fix build

oldGreg5 · oldGreg5 · commit 3a2c08e92e58 · 2025-06-16T13:00:08.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "tests",
   "src/catalyst-toolbox/catalyst-toolbox",
diff --git a/book.toml b/book.toml
@@ -30,7 +30,7 @@ endpoint = "http://kroki:8000"
 
 [preprocessor.admonish]
 command = "mdbook-admonish"
-assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
+assets_version = "3.1.0" # do not edit: managed by `mdbook-admonish install`
 on_failure = "bail"
 before = [
     "kroki-preprocessor" # Ensure we can put diagrams inside admonish blocks.
diff --git a/book/assets/css/mdbook-admonish.css b/book/assets/css/mdbook-admonish.css
diff --git a/src/chain-libs/chain-vote/src/cryptography/commitment.rs b/src/chain-libs/chain-vote/src/cryptography/commitment.rs
@@ -67,7 +67,7 @@ pub struct Open {
     pub r: Scalar,
 }
 
-#[cfg(tests)]
+#[cfg(test)]
 mod tests {
     use super::*;
     use rand_chacha::rand_core::SeedableRng;
diff --git a/src/chain-wallet-libs/bindings/wallet-uniffi/Cargo.toml b/src/chain-wallet-libs/bindings/wallet-uniffi/Cargo.toml
@@ -25,4 +25,5 @@ thiserror = {version = "1.0", default-features = false}
 uniffi_build = "0.21"
 
 [features]
+default = ["builtin-bindgen"]
 builtin-bindgen = ["uniffi_build/builtin-bindgen"]
diff --git a/src/sign/Cargo.toml b/src/sign/Cargo.toml
@@ -34,4 +34,4 @@ rand = "0.8.3"
 bech32 = "0.8"
 rand_core = { version = "0.5.1", default-features = false }
 ed25519-dalek = "1.0.1"
-reqwest = { version = "*", default_features = false, features = [ "blocking","json", "rustls-tls" ] }
+reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] }
diff --git a/src/vit-servicing-station-f10/vit-servicing-station-tests-f10/src/common/data/generator/voting/template/arbitrary.rs b/src/vit-servicing-station-f10/vit-servicing-station-tests-f10/src/common/data/generator/voting/template/arbitrary.rs
@@ -8,7 +8,7 @@ use fake::faker::internet::en::SafeEmail;
 use fake::{
     faker::lorem::en::*,
     faker::{
-        company::en::{Buzzword, CatchPhase, Industry},
+        company::en::{Buzzword, CatchPhrase, Industry},
         name::en::Name,
     },
     Fake,
@@ -134,15 +134,15 @@ impl ArbitraryValidVotingTemplateGenerator {
         match challenge_type {
             ChallengeType::Simple | ChallengeType::Native => {
                 ProposalChallengeInfo::Simple(SimpleChallengeInfo {
-                    proposal_solution: CatchPhase().fake::<String>(),
+                    proposal_solution: CatchPhrase().fake::<String>(),
                 })
             }
             ChallengeType::CommunityChoice => {
                 ProposalChallengeInfo::CommunityChoice(CommunityChoiceChallengeInfo {
-                    proposal_brief: CatchPhase().fake::<String>(),
-                    proposal_importance: CatchPhase().fake::<String>(),
-                    proposal_goal: CatchPhase().fake::<String>(),
-                    proposal_metrics: CatchPhase().fake::<String>(),
+                    proposal_brief: CatchPhrase().fake::<String>(),
+                    proposal_importance: CatchPhrase().fake::<String>(),
+                    proposal_goal: CatchPhrase().fake::<String>(),
+                    proposal_metrics: CatchPhrase().fake::<String>(),
                 })
             }
         }
@@ -156,8 +156,8 @@ impl ArbitraryValidVotingTemplateGenerator {
             proposal_id: self.next_proposal_id().to_string(),
             internal_id: self.generator.id().to_string(),
             category_name: Industry().fake::<String>(),
-            proposal_title: CatchPhase().fake::<String>(),
-            proposal_summary: CatchPhase().fake::<String>(),
+            proposal_title: CatchPhrase().fake::<String>(),
+            proposal_summary: CatchPhrase().fake::<String>(),
 
             proposal_funds: funds.to_string(),
             proposal_url: proposal_url.to_string(),
@@ -194,7 +194,7 @@ impl ValidVotingTemplateGenerator for ArbitraryValidVotingTemplateGenerator {
             internal_id: self.next_challenge_id(),
             id: self.generator.id().to_string(),
             challenge_type: self.challenge_type(),
-            title: CatchPhase().fake::<String>(),
+            title: CatchPhrase().fake::<String>(),
             description: Buzzword().fake::<String>(),
             rewards_total: (self.generator.next_u32() % 10000).to_string(),
             proposers_rewards: (self.generator.next_u32() % 10000).to_string(),
diff --git a/src/vit-servicing-station/vit-servicing-station-tests/src/common/data/generator/voting/template/arbitrary.rs b/src/vit-servicing-station/vit-servicing-station-tests/src/common/data/generator/voting/template/arbitrary.rs
@@ -8,7 +8,7 @@ use fake::faker::internet::en::SafeEmail;
 use fake::{
     faker::lorem::en::*,
     faker::{
-        company::en::{Buzzword, CatchPhase, Industry},
+        company::en::{Buzzword, CatchPhrase, Industry},
         name::en::Name,
     },
     Fake,
@@ -139,14 +139,14 @@ impl ArbitraryValidVotingTemplateGenerator {
     ) -> ProposalChallengeInfo {
         match challenge_type {
             ChallengeType::Simple => ProposalChallengeInfo::Simple(SimpleChallengeInfo {
-                proposal_solution: CatchPhase().fake::<String>(),
+                proposal_solution: CatchPhrase().fake::<String>(),
             }),
             ChallengeType::CommunityChoice => {
                 ProposalChallengeInfo::CommunityChoice(CommunityChoiceChallengeInfo {
-                    proposal_brief: CatchPhase().fake::<String>(),
-                    proposal_importance: CatchPhase().fake::<String>(),
-                    proposal_goal: CatchPhase().fake::<String>(),
-                    proposal_metrics: CatchPhase().fake::<String>(),
+                    proposal_brief: CatchPhrase().fake::<String>(),
+                    proposal_importance: CatchPhrase().fake::<String>(),
+                    proposal_goal: CatchPhrase().fake::<String>(),
+                    proposal_metrics: CatchPhrase().fake::<String>(),
                 })
             }
         }
@@ -160,8 +160,8 @@ impl ArbitraryValidVotingTemplateGenerator {
             proposal_id: self.next_proposal_id().to_string(),
             internal_id: self.generator.id().to_string(),
             category_name: Industry().fake::<String>(),
-            proposal_title: CatchPhase().fake::<String>(),
-            proposal_summary: CatchPhase().fake::<String>(),
+            proposal_title: CatchPhrase().fake::<String>(),
+            proposal_summary: CatchPhrase().fake::<String>(),
 
             proposal_funds: funds.to_string(),
             proposal_url: proposal_url.to_string(),
@@ -198,7 +198,7 @@ impl ValidVotingTemplateGenerator for ArbitraryValidVotingTemplateGenerator {
             internal_id: self.next_challenge_id(),
             id: self.generator.id().to_string(),
             challenge_type: self.challenge_type(),
-            title: CatchPhase().fake::<String>(),
+            title: CatchPhrase().fake::<String>(),
             description: Buzzword().fake::<String>(),
             rewards_total: (self.generator.next_u32() % 10000).to_string(),
             proposers_rewards: (self.generator.next_u32() % 10000).to_string(),
diff --git a/src/vit-testing/mainnet-lib/src/cardano_node/block.rs b/src/vit-testing/mainnet-lib/src/cardano_node/block.rs
@@ -1,12 +1,8 @@
 use crate::cardano_node::Settings;
-use cardano_serialization_lib::crypto::{
-    BlockHash, Ed25519Signature, KESSignature, KESVKey, PrivateKey, VRFCert, VRFVKey, Vkey,
-};
-use cardano_serialization_lib::metadata::AuxiliaryData;
-use cardano_serialization_lib::utils::BigNum;
 use cardano_serialization_lib::{
-    AuxiliaryDataSet, Block, Header, HeaderBody, OperationalCert, ProtocolVersion, Transaction,
-    TransactionBodies, TransactionWitnessSets,
+    AuxiliaryData, AuxiliaryDataSet, BigNum, Block, BlockHash, Ed25519Signature, Header,
+    HeaderBody, KESSignature, KESVKey, OperationalCert, PrivateKey, ProtocolVersion,
+    Transaction, TransactionBodies, TransactionWitnessSets, VRFCert, VRFVKey, Vkey,
 };
 
 /// Block0 representation
diff --git a/src/vit-testing/mainnet-lib/src/cardano_node/transaction.rs b/src/vit-testing/mainnet-lib/src/cardano_node/transaction.rs
@@ -1,7 +1,5 @@
-use cardano_serialization_lib::address::Address;
-use cardano_serialization_lib::metadata::{AuxiliaryData, GeneralTransactionMetadata};
-use cardano_serialization_lib::utils::{Coin, Value};
 use cardano_serialization_lib::{
+    Address, AuxiliaryData, GeneralTransactionMetadata, Coin, Value,
     Transaction, TransactionBody, TransactionInputs, TransactionOutput, TransactionOutputs,
     TransactionWitnessSet,
 };
diff --git a/src/vit-testing/mainnet-lib/src/db_sync/in_memory.rs b/src/vit-testing/mainnet-lib/src/db_sync/in_memory.rs
@@ -1,6 +1,5 @@
 use crate::{Block0, InMemoryNode, CARDANO_MAINNET_SLOTS_PER_EPOCH};
-use cardano_serialization_lib::metadata::GeneralTransactionMetadata;
-use cardano_serialization_lib::utils::BigNum;
+use cardano_serialization_lib::{BigNum, GeneralTransactionMetadata};
 use cardano_serialization_lib::{Block, Transaction, TransactionWitnessSet};
 use futures::executor::block_on;
 use futures_util::StreamExt;
diff --git a/src/vit-testing/mainnet-lib/src/network/wallet_state/mod.rs b/src/vit-testing/mainnet-lib/src/network/wallet_state/mod.rs
@@ -5,7 +5,7 @@ pub use builder::MainnetWalletStateBuilder;
 use std::fmt::{Debug, Formatter};
 pub use template::{build, build_default, Actor, Error as TemplateError, ExternalProvider};
 
-use cardano_serialization_lib::address::Address;
+use cardano_serialization_lib::Address;
 use cardano_serialization_lib::Transaction;
 use jormungandr_lib::crypto::account::Identifier;
 
diff --git a/src/vit-testing/mainnet-lib/src/network/wallet_state/template/external_providers.rs b/src/vit-testing/mainnet-lib/src/network/wallet_state/template/external_providers.rs
@@ -3,8 +3,7 @@ use crate::network::wallet_state::template::Error;
 use crate::wallet_state::MainnetWalletState;
 use crate::CardanoWallet;
 use async_trait::async_trait;
-use cardano_serialization_lib::address::Address;
-use rand::Rng;
+use cardano_serialization_lib::{Address, BigNum, Coin, Value};
 
 /// Trait for retrieving information about address registrations from network
 #[async_trait]
diff --git a/src/vit-testing/mainnet-lib/src/wallet/mod.rs b/src/vit-testing/mainnet-lib/src/wallet/mod.rs
@@ -6,10 +6,9 @@ pub use crate::wallet::registration::{
     REGISTRATION_METADATA_LABEL, REGISTRATION_METADATA_SIGNATURE_LABEL,
     REGISTRATION_SIGNATURE_METADATA_IDX,
 };
-use cardano_serialization_lib::address::{
-    BaseAddress, NetworkInfo, RewardAddress, StakeCredential,
+use cardano_serialization_lib::{
+    BaseAddress, NetworkInfo, PrivateKey, PublicKey, RewardAddress, StakeCredential,
 };
-use cardano_serialization_lib::crypto::{PrivateKey, PublicKey};
 use cardano_serialization_lib::Transaction;
 use chain_addr::Discrimination;
 use jormungandr_lib::crypto::account::Identifier;
diff --git a/src/vit-testing/mainnet-lib/src/wallet/registration.rs b/src/vit-testing/mainnet-lib/src/wallet/registration.rs
@@ -1,14 +1,11 @@
 use crate::cardano_node::TransactionBuilder;
 use crate::CardanoWallet;
-use cardano_serialization_lib::address::Address;
-use cardano_serialization_lib::chain_crypto::Blake2b256;
-use cardano_serialization_lib::crypto::{Ed25519Signature, PublicKey};
-use cardano_serialization_lib::error::JsError;
-use cardano_serialization_lib::metadata::{
-    decode_metadatum_to_json_str, encode_json_value_to_metadatum, GeneralTransactionMetadata,
-    MetadataJsonSchema, MetadataList, MetadataMap, TransactionMetadatum, TransactionMetadatumLabel,
+use cardano_serialization_lib::{
+    Address, BigNum, Ed25519Signature, GeneralTransactionMetadata, Int, JsError,
+    MetadataJsonSchema, MetadataList, MetadataMap, PublicKey, TransactionMetadatum,
+    TransactionMetadatumLabel, decode_metadatum_to_json_str, encode_json_value_to_metadatum,
 };
-use cardano_serialization_lib::utils::{BigNum, Int};
+use cardano_serialization_lib::chain_crypto::Blake2b256;
 use cardano_serialization_lib::Transaction;
 use serde_json::Map;
 use snapshot_lib::registration::Delegations;
@@ -356,9 +353,6 @@ impl GeneralTransactionMetadataInfo for GeneralTransactionMetadata {
 #[cfg(test)]
 mod test {
     use super::*;
-    use cardano_serialization_lib::metadata::{
-        decode_metadatum_to_json_str, encode_json_value_to_metadatum, MetadataJsonSchema,
-    };
     use jormungandr_lib::crypto::account::Identifier;
 
     #[test]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`[workspace]`
	`2`	`+resolver = "2"`
`2`	`3`	`members = [`
`3`	`4`	`"tests",`
`4`	`5`	`"src/catalyst-toolbox/catalyst-toolbox",`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ pub struct Open {`
`67`	`67`	`pub r: Scalar,`
`68`	`68`	`}`
`69`	`69`
`70`		`-#[cfg(tests)]`
	`70`	`+#[cfg(test)]`
`71`	`71`	`mod tests {`
`72`	`72`	`use super::*;`
`73`	`73`	`use rand_chacha::rand_core::SeedableRng;`