diff --git a/Cargo.toml b/Cargo.toml index 8ac0fbb..1143bb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ # file: Cargo.toml -# version: 384 +# version: 385 [workspace] resolver = "3" members = ["crates/ksp-app-config-desk", "crates/ksp-app-solprices-desk", "crates/ksp-app-wallet-desk", "crates/ksp-config-lib", "crates/ksp-core-lib", "crates/ksp-interface-lib", "crates/ksp-logging-lib", "crates/ksp-offchain-transport-lib", "crates/ksp-onchain-transport-lib", "crates/ksp-program-api", "crates/ksp-store-api", "crates/ksp-store-lib", "crates/ksp-store-postgres-lib", "crates/ksp-wallet-lib"] [workspace.package] -version = "0.3.5-pre.2" +version = "0.3.5-pre.2.fix.1" edition = "2024" license = "MIT" repository = "https://git.sasedev.com/Sasedev/khadhroony-solana-project" diff --git a/crates/ksp-interface-lib/tests/release_completeness.rs b/crates/ksp-interface-lib/tests/release_completeness.rs index 774a984..1bd4d33 100644 --- a/crates/ksp-interface-lib/tests/release_completeness.rs +++ b/crates/ksp-interface-lib/tests/release_completeness.rs @@ -1,5 +1,7 @@ // file: crates/ksp-interface-lib/tests/release_completeness.rs -// version: 2 +// version: 3 + +//! Release-completeness canaries for the public `ksp-interface-lib` surface. fn crate_root_source() -> std::result::Result { let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src/lib.rs"); @@ -12,12 +14,10 @@ fn v0_3_5_pre_002_foundation_keeps_one_error_code_and_adds_one_passive_acquisiti assert_eq!(ksp_interface_lib::ERROR_CODE_PROGRAM_INSTRUCTION_LIMIT_EXCEEDED.code(), "program_instruction_limit_exceeded"); assert_eq!(ksp_interface_lib::MAX_PROGRAM_INSTRUCTION_ACCOUNTS, 255); assert_eq!(ksp_interface_lib::MAX_PROGRAM_INSTRUCTION_DATA_LEN, 10_240); - let program_id = ksp_interface_lib::Pubkey::new_from_array([0xB1_u8; 32]); let account = ksp_interface_lib::ProgramAccountMeta::readonly(ksp_interface_lib::Pubkey::new_from_array([0xB2_u8; 32]), false); let instruction_result = ksp_interface_lib::ProgramInstruction::try_new(program_id, std::vec![account], std::vec![0xB3_u8]); assert!(instruction_result.is_ok()); - let lifecycle = ksp_interface_lib::SlotLifecycleEvent::new(u64::MAX, ksp_interface_lib::SlotLifecycleStage::Rooted); assert_eq!(lifecycle.slot(), u64::MAX); assert_eq!(lifecycle.stage(), ksp_interface_lib::SlotLifecycleStage::Rooted); @@ -25,9 +25,11 @@ fn v0_3_5_pre_002_foundation_keeps_one_error_code_and_adds_one_passive_acquisiti #[test] fn v0_3_5_pre_002_exact_crate_root_export_inventory_includes_slot_lifecycle() -> std::result::Result<(), std::io::Error> { - let source = crate_root_source()?; - let public_use_count = source.lines().filter(|line| line.starts_with("pub use ")).count(); - + let source = match crate_root_source() { + Ok(source) => source, + Err(error) => return Err(error), + }; + let public_use_count = source.lines().filter(|line| return line.starts_with("pub use ")).count(); assert_eq!(public_use_count, 8); assert!(source.contains("pub use self::error::ERROR_CODE_PROGRAM_INSTRUCTION_LIMIT_EXCEEDED;")); assert!(source.contains("pub use self::program_account_meta::MAX_PROGRAM_INSTRUCTION_ACCOUNTS;")); @@ -37,20 +39,23 @@ fn v0_3_5_pre_002_exact_crate_root_export_inventory_includes_slot_lifecycle() -> assert!(source.contains("pub use self::slot_lifecycle::SlotLifecycleEvent;")); assert!(source.contains("pub use self::slot_lifecycle::SlotLifecycleStage;")); assert!(source.contains("pub use ksp_core_lib::Pubkey;")); - return Ok(()); } #[test] fn v0_3_5_pre_002_production_module_inventory_adds_only_slot_lifecycle() -> std::result::Result<(), std::io::Error> { - let source = crate_root_source()?; - let modules = source.lines().filter_map(|line| line.strip_prefix("mod ").and_then(|module| module.strip_suffix(';'))).collect::>(); - + let source = match crate_root_source() { + Ok(source) => source, + Err(error) => return Err(error), + }; + let modules = source + .lines() + .filter_map(|line| return line.strip_prefix("mod ").and_then(|module| return module.strip_suffix(';'))) + .collect::>(); assert_eq!(modules, std::vec!["error", "program_account_meta", "program_instruction", "slot_lifecycle"]); assert!(!source.contains("serde")); assert!(!source.contains("tracing")); assert!(!source.contains("ksp_onchain_transport")); assert!(!source.contains("ksp_store")); - return Ok(()); } diff --git a/crates/ksp-interface-lib/tests/slot_lifecycle_public_api.rs b/crates/ksp-interface-lib/tests/slot_lifecycle_public_api.rs index f29b3ba..dd9e13a 100644 --- a/crates/ksp-interface-lib/tests/slot_lifecycle_public_api.rs +++ b/crates/ksp-interface-lib/tests/slot_lifecycle_public_api.rs @@ -1,10 +1,11 @@ // file: crates/ksp-interface-lib/tests/slot_lifecycle_public_api.rs -// version: 1 +// version: 2 + +//! Public API canaries for the shared slot lifecycle event contract. #[test] fn public_v0_3_5_pre_002_slot_lifecycle_contract_is_available_from_crate_root() { let event = ksp_interface_lib::SlotLifecycleEvent::new(u64::MAX, ksp_interface_lib::SlotLifecycleStage::Rooted); - assert_eq!(event.slot(), u64::MAX); assert_eq!(event.stage(), ksp_interface_lib::SlotLifecycleStage::Rooted); } @@ -23,7 +24,6 @@ fn public_v0_3_5_pre_002_slot_lifecycle_stage_remains_downstream_evolvable() { _ => "future", }; } - assert_eq!(stage_label(ksp_interface_lib::SlotLifecycleStage::Processed), "processed"); assert_eq!(stage_label(ksp_interface_lib::SlotLifecycleStage::Rooted), "rooted"); } diff --git a/crates/ksp-interface-lib/unit_tests/slot_lifecycle.rs b/crates/ksp-interface-lib/unit_tests/slot_lifecycle.rs index 91b3ea7..413ad15 100644 --- a/crates/ksp-interface-lib/unit_tests/slot_lifecycle.rs +++ b/crates/ksp-interface-lib/unit_tests/slot_lifecycle.rs @@ -1,12 +1,10 @@ // file: crates/ksp-interface-lib/unit_tests/slot_lifecycle.rs -// version: 1 +// version: 2 #[test] fn slot_lifecycle_stages_are_distinct_copy_and_complete_for_the_admitted_family() { fn assert_copy() {} - assert_copy::(); - let stages = [ crate::SlotLifecycleStage::Processed, crate::SlotLifecycleStage::FirstShredReceived, @@ -16,7 +14,6 @@ fn slot_lifecycle_stages_are_distinct_copy_and_complete_for_the_admitted_family( crate::SlotLifecycleStage::OptimisticallyConfirmed, crate::SlotLifecycleStage::Rooted, ]; - for (index, stage) in stages.iter().enumerate() { for other in stages.iter().skip(index + 1) { assert_ne!(stage, other); @@ -27,11 +24,8 @@ fn slot_lifecycle_stages_are_distinct_copy_and_complete_for_the_admitted_family( #[test] fn slot_lifecycle_event_preserves_full_u64_slot_and_stage() { fn assert_copy() {} - assert_copy::(); - let event = crate::SlotLifecycleEvent::new(u64::MAX, crate::SlotLifecycleStage::Rooted); - assert_eq!(event.slot(), u64::MAX); assert_eq!(event.stage(), crate::SlotLifecycleStage::Rooted); let copied = event; @@ -42,7 +36,6 @@ fn slot_lifecycle_event_preserves_full_u64_slot_and_stage() { fn slot_lifecycle_debug_is_bounded_and_contains_only_shared_fields() { let event = crate::SlotLifecycleEvent::new(42, crate::SlotLifecycleStage::OptimisticallyConfirmed); let debug = std::format!("{event:?}"); - assert!(debug.len() <= 128); assert!(debug.contains("slot: 42")); assert!(debug.contains("OptimisticallyConfirmed")); diff --git a/deltas/0.3.5/pre.002-fix.001.md b/deltas/0.3.5/pre.002-fix.001.md new file mode 100644 index 0000000..da72678 --- /dev/null +++ b/deltas/0.3.5/pre.002-fix.001.md @@ -0,0 +1,67 @@ +# Delta `0.3.5-pre.002-fix.001` + +## Objet + +Corriger les défauts de conformité Rust révélés par le gate opérateur de `0.3.5-pre.002`, sans modifier le contrat fonctionnel `SlotLifecycleEvent` / `SlotLifecycleStage`. + +## Base + +```text +0.3.5-pre.002 +workspace.package.version = 0.3.5-pre.2 +``` + +## Diagnostic opérateur + +Le code fonctionnel et les tests ciblés passent, mais le gate global n'est pas propre : + +- 15 violations `RUST-FMT-101` pour des lignes vides à l'intérieur de fonctions de tests ; +- 2 usages de l'opérateur `?` rejetés par `clippy::question_mark_used` ; +- closures à retour implicite rejetées par `clippy::implicit_return` ; +- documentation crate-level manquante dans les deux nouveaux tests d'intégration. + +## Correction + +- supprimer les lignes vides internes aux fonctions concernées ; +- remplacer `?` par une propagation explicite via `match` ; +- rendre explicites les `return` des closures concernées ; +- ajouter la documentation crate-level aux tests d'intégration ; +- conserver strictement les sept variantes de `SlotLifecycleStage` et la forme de `SlotLifecycleEvent` ; +- ne pas ajouter de `allow`, de dépendance, de codec, de runtime ou de conversion Transport. + +## Version + +Le fix modifie des fichiers Rust ; la version workspace est donc incrémentée suivant la convention de fix prerelease : + +```text +workspace.package.version = 0.3.5-pre.2.fix.1 +``` + +Le numéro documentaire reste : + +```text +0.3.5-pre.002-fix.001 +``` + +## Fichiers modifiés + +```text +Cargo.toml +crates/ksp-interface-lib/tests/release_completeness.rs +crates/ksp-interface-lib/tests/slot_lifecycle_public_api.rs +crates/ksp-interface-lib/unit_tests/slot_lifecycle.rs +docs/validation/022-V0_3_5_INTERFACE_ACQUISITION_EVENTS.md +deltas/0.3.5/pre.002-fix.001.md +``` + +## Gate demandé + +```bash +cargo fmt --all +python3 scripts/audit_rust_workspace_rules.py +python3 scripts/audit_markdown_tables.py README.md RULES.md ROADMAP.md CHANGELOG.md docs prompts crates deltas/0.3.5 +cargo check --workspace +cargo clippy --workspace --all-targets +cargo test -p ksp-interface-lib +cargo test -p ksp-program-api +``` diff --git a/docs/validation/022-V0_3_5_INTERFACE_ACQUISITION_EVENTS.md b/docs/validation/022-V0_3_5_INTERFACE_ACQUISITION_EVENTS.md index c47ce6d..97bd0d4 100644 --- a/docs/validation/022-V0_3_5_INTERFACE_ACQUISITION_EVENTS.md +++ b/docs/validation/022-V0_3_5_INTERFACE_ACQUISITION_EVENTS.md @@ -386,3 +386,17 @@ cargo test -p ksp-program-api Les validations Cargo de `pre.002` restent **à exécuter par l'opérateur** ; elles ne sont pas déclarées réussies par l'environnement d'assemblage. + +## 17. Gate opérateur `pre.002` et correction `pre.002-fix.001` + +Le gate opérateur de `pre.002` confirme que le contrat fonctionnel `SlotLifecycleEvent` compile et que ses tests ciblés passent, mais la tranche n'est pas admissible en l'état : l'audit Rust détecte quinze violations `RUST-FMT-101` dans les nouveaux tests et Clippy rejette deux usages de `?` ainsi que des closures à retour implicite. Les deux nouveaux tests d'intégration exposent également un warning `missing_docs` au niveau crate. + +`pre.002-fix.001` corrige uniquement ces défauts de conformité : suppression des lignes vides à l'intérieur des fonctions, propagation d'erreur explicite par `match`, `return` explicite dans les closures concernées et documentation crate-level des tests d'intégration. Aucun contrat public `SlotLifecycleEvent` / `SlotLifecycleStage` n'est modifié. + +Comme le fix modifie des sources Rust, la version workspace évolue conformément à la politique KSP : + +```text +0.3.5-pre.2.fix.1 +``` + +Le nom documentaire de la correction reste `0.3.5-pre.002-fix.001`.