fix(storagext): update .scale & api accordingly (#707)

eigerco · Jan 29, 2025 · fb63b1f · fb63b1f
1 parent acd3b89
commit fb63b1f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/storagext/lib/artifacts/metadata.scale b/storagext/lib/artifacts/metadata.scale
diff --git a/storagext/lib/src/runtime/display/storage_provider.rs b/storagext/lib/src/runtime/display/storage_provider.rs
@@ -1,5 +1,5 @@
 use crate::runtime::{
-    runtime_types::pallet_storage_provider::{fault, sector},
+    runtime_types::{pallet_storage_provider::fault, primitives::sector::pre_commit},
     storage_provider::{events, Event},
 };
 
@@ -33,7 +33,7 @@ impl std::fmt::Display for fault::RecoveryDeclaration {
     }
 }
 
-impl<T> std::fmt::Display for sector::SectorPreCommitInfo<T>
+impl<T> std::fmt::Display for pre_commit::SectorPreCommitInfo<T>
 where
     T: std::fmt::Display,
 {

diff --git a/storagext/lib/src/runtime/mod.rs b/storagext/lib/src/runtime/mod.rs
@@ -25,11 +25,11 @@ pub mod display;
         with = "::primitives::proofs::RegisteredPoStProof",
     ),
     substitute_type(
-        path = "primitives::sector::SectorSize",
+        path = "primitives::sector::size::SectorSize",
         with = "::primitives::sector::SectorSize",
     ),
     substitute_type(
-        path = "primitives::sector::SectorNumber",
+        path = "primitives::sector::number::SectorNumber",
         with = "::primitives::sector::SectorNumber",
     ),
     // impl Deserialize
@@ -89,11 +89,11 @@ pub mod display;
         derive = "::serde::Serialize"
     ),
     derive_for_type(
-        path = "pallet_storage_provider::sector::SectorPreCommitInfo",
+        path = "primitives::sector::pre_commit::SectorPreCommitInfo",
         derive = "::serde::Serialize"
     ),
     derive_for_type(
-        path = "pallet_storage_provider::sector::ProveCommitSector",
+        path = "primitives::sector::prove_commit::ProveCommitSector",
         derive = "::serde::Serialize"
     ),
     derive_for_type(

diff --git a/storagext/lib/src/types/storage_provider.rs b/storagext/lib/src/types/storage_provider.rs
@@ -29,13 +29,17 @@ use crate::{
                     SubmitWindowedPoStParams as RuntimeSubmitWindowedPoStParams,
                 },
                 sector::{
-                    ProveCommitSector as RuntimeProveCommitSector,
-                    SectorPreCommitInfo as RuntimeSectorPreCommitInfo,
                     TerminateSectorsParams as RuntimeTerminateSectorsParams,
                     TerminationDeclaration as RuntimeTerminationDeclaration,
                 },
             },
-            primitives::pallets::DeadlineState as RuntimeDeadlineState,
+            primitives::{
+                pallets::DeadlineState as RuntimeDeadlineState,
+                sector::{
+                    pre_commit::SectorPreCommitInfo as RuntimeSectorPreCommitInfo,
+                    prove_commit::ProveCommitSector as RuntimeProveCommitSector,
+                },
+            },
         },
     },
     BlockNumber,