From 352d1c7ad9a64cb0bd3130d29b62039c9f5a9e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Duarte?= Date: Fri, 24 Jan 2025 14:15:39 +0000 Subject: [PATCH] feat(pallet-storage-provider): extract ProveCommitSector --- pallets/storage-provider/src/lib.rs | 4 ++-- pallets/storage-provider/src/sector.rs | 9 +-------- .../storage-provider/src/tests/declare_faults.rs | 3 +-- pallets/storage-provider/src/tests/post_hook.rs | 6 ++++-- .../src/tests/pre_commit_sector_hook.rs | 3 +-- .../src/tests/prove_commit_sectors.rs | 7 +++++-- .../src/tests/submit_windowed_post.rs | 3 +-- primitives/src/sector/mod.rs | 2 ++ primitives/src/sector/prove_commit.rs | 13 +++++++++++++ 9 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 primitives/src/sector/prove_commit.rs diff --git a/pallets/storage-provider/src/lib.rs b/pallets/storage-provider/src/lib.rs index c39ae11db..02b2783c1 100644 --- a/pallets/storage-provider/src/lib.rs +++ b/pallets/storage-provider/src/lib.rs @@ -60,7 +60,7 @@ pub mod pallet { }, proofs::{derive_prover_id, PublicReplicaInfo, RegisteredPoStProof}, randomness::{draw_randomness, AuthorVrfHistory, DomainSeparationTag}, - sector::{SectorNumber, SectorPreCommitInfo}, + sector::{ProveCommitSector, SectorNumber, SectorPreCommitInfo}, PartitionNumber, MAX_PARTITIONS_PER_DEADLINE, MAX_SEAL_PROOF_BYTES, MAX_SECTORS, MAX_SECTORS_PER_CALL, }; @@ -75,7 +75,7 @@ pub mod pallet { }, proofs::{assign_proving_period_offset, SubmitWindowedPoStParams}, sector::{ - ProveCommitResult, ProveCommitSector, SectorOnChainInfo, SectorPreCommitOnChainInfo, + ProveCommitResult, SectorOnChainInfo, SectorPreCommitOnChainInfo, TerminateSectorsParams, TerminationDeclaration, }, sector_map::DeadlineSectorMap, diff --git a/pallets/storage-provider/src/sector.rs b/pallets/storage-provider/src/sector.rs index fb492bc31..4e920bfb5 100644 --- a/pallets/storage-provider/src/sector.rs +++ b/pallets/storage-provider/src/sector.rs @@ -4,7 +4,7 @@ use primitives::{ pallets::SectorDeal, proofs::RegisteredSealProof, sector::{SectorNumber, SectorPreCommitInfo}, - PartitionNumber, CID_SIZE_IN_BYTES, MAX_SEAL_PROOF_BYTES, MAX_TERMINATIONS_PER_CALL, + PartitionNumber, CID_SIZE_IN_BYTES, MAX_TERMINATIONS_PER_CALL, }; use scale_info::TypeInfo; @@ -89,13 +89,6 @@ where } } -/// Arguments passed into the `prove_commit_sector` extrinsic. -#[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq, TypeInfo)] -pub struct ProveCommitSector { - pub sector_number: SectorNumber, - pub proof: BoundedVec>, -} - /// Type that is emitted after a successful prove commit extrinsic. #[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq, TypeInfo)] pub struct ProveCommitResult { diff --git a/pallets/storage-provider/src/tests/declare_faults.rs b/pallets/storage-provider/src/tests/declare_faults.rs index 173b2db48..1088a0e12 100644 --- a/pallets/storage-provider/src/tests/declare_faults.rs +++ b/pallets/storage-provider/src/tests/declare_faults.rs @@ -1,5 +1,5 @@ use frame_support::{assert_err, assert_noop, assert_ok, pallet_prelude::*}; -use primitives::sector::SectorNumber; +use primitives::sector::{ProveCommitSector, SectorNumber}; use rstest::rstest; use sp_core::bounded_vec; use sp_runtime::{traits::BlockNumberProvider, BoundedVec}; @@ -9,7 +9,6 @@ use crate::{ error::GeneralPalletError, fault::{DeclareFaultsParams, FaultDeclaration}, pallet::{Error, Event, StorageProviders, DECLARATIONS_MAX}, - sector::ProveCommitSector, tests::{ account, events, new_test_ext, register_storage_provider, run_to_block, sector_set, DealProposalBuilder, DeclareFaultsBuilder, Market, RuntimeEvent, RuntimeOrigin, diff --git a/pallets/storage-provider/src/tests/post_hook.rs b/pallets/storage-provider/src/tests/post_hook.rs index e40575ad9..72e205b81 100644 --- a/pallets/storage-provider/src/tests/post_hook.rs +++ b/pallets/storage-provider/src/tests/post_hook.rs @@ -1,12 +1,14 @@ use frame_support::{assert_ok, pallet_prelude::Get}; -use primitives::{sector::SectorNumber, DealId, MAX_SECTORS}; +use primitives::{ + sector::{ProveCommitSector, SectorNumber}, + DealId, MAX_SECTORS, +}; use sp_core::bounded_vec; use sp_runtime::{BoundedBTreeMap, BoundedBTreeSet}; use super::new_test_ext; use crate::{ pallet::{Config, Event, StorageProviders}, - sector::ProveCommitSector, tests::{ account, events, publish_deals, register_storage_provider, run_to_block, sector_set, RuntimeEvent, RuntimeOrigin, SectorPreCommitInfoBuilder, StorageProvider, diff --git a/pallets/storage-provider/src/tests/pre_commit_sector_hook.rs b/pallets/storage-provider/src/tests/pre_commit_sector_hook.rs index 5e9ed1e9d..a97a77e97 100644 --- a/pallets/storage-provider/src/tests/pre_commit_sector_hook.rs +++ b/pallets/storage-provider/src/tests/pre_commit_sector_hook.rs @@ -1,11 +1,10 @@ -use primitives::sector::SectorNumber; +use primitives::sector::{ProveCommitSector, SectorNumber}; use sp_core::bounded_vec; use sp_runtime::{BoundedBTreeMap, BoundedBTreeSet}; use super::new_test_ext; use crate::{ pallet::{Event, StorageProviders}, - sector::ProveCommitSector, tests::{ account, events, publish_deals, register_storage_provider, run_to_block, Market, RuntimeEvent, RuntimeOrigin, SectorPreCommitInfoBuilder, StorageProvider, System, Test, diff --git a/pallets/storage-provider/src/tests/prove_commit_sectors.rs b/pallets/storage-provider/src/tests/prove_commit_sectors.rs index 40111cbe7..06525cf3c 100644 --- a/pallets/storage-provider/src/tests/prove_commit_sectors.rs +++ b/pallets/storage-provider/src/tests/prove_commit_sectors.rs @@ -1,6 +1,9 @@ use frame_support::{assert_noop, assert_ok, pallet_prelude::*}; use frame_system::pallet_prelude::BlockNumberFor; -use primitives::{sector::SectorPreCommitInfo, MAX_SECTORS_PER_CALL}; +use primitives::{ + sector::{ProveCommitSector, SectorPreCommitInfo}, + MAX_SECTORS_PER_CALL, +}; use sp_core::bounded_vec; use super::{new_test_ext, MaxProveCommitDuration}; @@ -8,7 +11,7 @@ use crate::{ deadline::deadline_is_mutable, error::GeneralPalletError, pallet::{Error, Event, StorageProviders}, - sector::{ProveCommitResult, ProveCommitSector}, + sector::ProveCommitResult, tests::{ account, events, publish_deals, register_storage_provider, run_to_block, Market, RuntimeEvent, RuntimeOrigin, SectorPreCommitInfoBuilder, StorageProvider, System, Test, diff --git a/pallets/storage-provider/src/tests/submit_windowed_post.rs b/pallets/storage-provider/src/tests/submit_windowed_post.rs index 5be343b08..02178e37f 100644 --- a/pallets/storage-provider/src/tests/submit_windowed_post.rs +++ b/pallets/storage-provider/src/tests/submit_windowed_post.rs @@ -1,5 +1,5 @@ use frame_support::{assert_noop, assert_ok}; -use primitives::{testing::INVALID_PROOF, PartitionNumber}; +use primitives::{sector::ProveCommitSector, testing::INVALID_PROOF, PartitionNumber}; use rstest::rstest; use sp_core::bounded_vec; use sp_runtime::{BoundedVec, DispatchError}; @@ -7,7 +7,6 @@ use sp_runtime::{BoundedVec, DispatchError}; use crate::{ error::GeneralPalletError, pallet::{Error, Event, StorageProviders}, - sector::ProveCommitSector, tests::{ account, declare_faults::setup_sp_with_many_sectors_multiple_partitions, events, new_test_ext, register_storage_provider, run_to_block, DealProposalBuilder, Market, diff --git a/primitives/src/sector/mod.rs b/primitives/src/sector/mod.rs index 693970662..c5850e006 100644 --- a/primitives/src/sector/mod.rs +++ b/primitives/src/sector/mod.rs @@ -1,10 +1,12 @@ mod number; mod pre_commit; +mod prove_commit; mod size; // NOTE(@jmg-duarte,16/01/2025): unsure if the visitor should be exposed pub use number::{SectorNumber, SectorNumberError}; pub use pre_commit::SectorPreCommitInfo; +pub use prove_commit::ProveCommitSector; pub use size::SectorSize; // `test` is only useful locally diff --git a/primitives/src/sector/prove_commit.rs b/primitives/src/sector/prove_commit.rs new file mode 100644 index 000000000..40435f6df --- /dev/null +++ b/primitives/src/sector/prove_commit.rs @@ -0,0 +1,13 @@ +use codec::{Decode, Encode}; +use scale_info::TypeInfo; +use sp_core::{ConstU32, RuntimeDebug}; +use sp_runtime::BoundedVec; + +use crate::{sector::SectorNumber, MAX_SEAL_PROOF_BYTES}; + +/// Arguments passed into the `prove_commit_sector` extrinsic. +#[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq, TypeInfo)] +pub struct ProveCommitSector { + pub sector_number: SectorNumber, + pub proof: BoundedVec>, +}