fixup

Author: rymnc

crates/proof_system/global_merkle_root/storage/src/column.rs

@@ -59,50 +59,54 @@ impl TableColumn {
 /// in the case of malicious block.
 #[repr(u32)]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum Column {
+pub enum Column<TC: core::fmt::Debug> {
     /// The column with the specific data.
-    TableColumn(TableColumn),
+    TableColumn(TC),
     /// The column with the merkle tree nodes.
-    MerkleDataColumn(TableColumn),
+    MerkleDataColumn(TC),
     /// The merkle metadata column.
     MerkleMetadataColumn,
 }
 
-impl Column {
+impl<TC> Column<TC>
+where
+    TC: StorageColumn,
+{
     /// The total count of variants in the enum.
     pub const COUNT: usize = TableColumn::COUNT + TableColumn::COUNT + 1;
 
     /// The start of the merkle data columns.
     pub const MERKLE_DATA_COLUMNS_START: u32 = u16::MAX as u32;
 
     /// Returns the `usize` representation of the `Column`.
-    pub fn as_u32(&self) -> u32 {
+    pub fn as_u32(&self) -> usize {
         match self {
-            Self::TableColumn(column) => column.as_u32(),
-            Self::MerkleDataColumn(column) => {
-                Self::MERKLE_DATA_COLUMNS_START.wrapping_add(column.as_u32())
-            }
-            Self::MerkleMetadataColumn => u32::MAX,
+            Self::TableColumn(column) => column.as_usize(),
+            Self::MerkleDataColumn(column) => Self::MERKLE_DATA_COLUMNS_START
+                .wrapping_add(column.as_usize() as u32)
+                as usize,
+            Self::MerkleMetadataColumn => u32::MAX as usize,
         }
     }
 }
 
-impl StorageColumn for Column {
+impl<TC> StorageColumn for Column<TC>
+where
+    TC: core::fmt::Debug + Copy,
+{
     fn name(&self) -> String {
         match self {
             Self::TableColumn(column) => {
-                let str: &str = column.into();
-                str.to_string()
+                format!("{:?}", column)
             }
             Self::MerkleDataColumn(column) => {
-                let str: &str = column.into();
-                format!("Merkle{}", str)
+                format!("Merkle{:?}", column)
             }
             Column::MerkleMetadataColumn => "MerkleMetadata".to_string(),
         }
     }
 
     fn id(&self) -> u32 {
-        self.as_u32()
+        self.as_usize() as u32
     }
 }

crates/proof_system/global_merkle_root/storage/src/compute.rs

@@ -28,7 +28,10 @@ use fuel_core_types::{
 };
 
 use crate::{
-    column::Column,
+    column::{
+        Column,
+        TableColumn,
+    },
     merkle::{
         DummyStorage,
         Merkleized,
@@ -44,14 +47,14 @@ pub trait ComputeStateRoot {
     /// Compute the merkle root of the specific table
     fn merkle_root<Table>(&self) -> Result<MerkleRoot, StorageError>
     where
-        Table: Mappable + MerkleizedTableColumn,
+        Table: Mappable + MerkleizedTableColumn<TableColumn = TableColumn>,
         Table: TableWithBlueprint,
-        Table::Blueprint: BlueprintInspect<Table, DummyStorage<Column>>;
+        Table::Blueprint: BlueprintInspect<Table, DummyStorage<Column<TableColumn>>>;
 }
 
 impl<Storage> ComputeStateRoot for StorageTransaction<Storage>
 where
-    Storage: KeyValueInspect<Column = Column>,
+    Storage: KeyValueInspect<Column = Column<TableColumn>>,
 {
     fn state_root(&self) -> Result<Bytes32, StorageError> {
         let roots = [
@@ -77,9 +80,9 @@ where
 
     fn merkle_root<Table>(&self) -> Result<MerkleRoot, StorageError>
     where
-        Table: Mappable + MerkleizedTableColumn,
+        Table: Mappable + MerkleizedTableColumn<TableColumn = TableColumn>,
         Table: TableWithBlueprint,
-        Table::Blueprint: BlueprintInspect<Table, DummyStorage<Column>>,
+        Table::Blueprint: BlueprintInspect<Table, DummyStorage<Column<TableColumn>>>,
     {
         <Self as MerkleRootStorage<u32, Merkleized<Table>>>::root(
             self,

crates/proof_system/global_merkle_root/storage/src/merkle.rs

@@ -1,7 +1,4 @@
-use crate::column::{
-    Column,
-    TableColumn,
-};
+use crate::column::Column;
 use alloc::borrow::Cow;
 use fuel_core_storage::{
     blueprint::{
@@ -50,8 +47,10 @@ pub struct Merkleized<Table>(core::marker::PhantomData<Table>);
 /// Implementation of this trait for the table, inherits
 /// the Merkle implementation for the [`Merkleized`] table.
 pub trait MerkleizedTableColumn {
+    /// The table column type
+    type TableColumn;
     /// Get the table column
-    fn table_column() -> TableColumn;
+    fn table_column() -> Self::TableColumn;
 }
 
 impl<Table> Mappable for Merkleized<Table>
@@ -64,30 +63,33 @@ where
     type OwnedValue = <Table as Mappable>::OwnedValue;
 }
 
-type KeyCodec<Table> = <<Table as TableWithBlueprint>::Blueprint as BlueprintInspect<
-    Table,
-    DummyStorage<Column>,
->>::KeyCodec;
+type KeyCodec<Table, TC> =
+    <<Table as TableWithBlueprint>::Blueprint as BlueprintInspect<
+        Table,
+        DummyStorage<Column<TC>>,
+    >>::KeyCodec;
 
-type ValueCodec<Table> = <<Table as TableWithBlueprint>::Blueprint as BlueprintInspect<
-    Table,
-    DummyStorage<Column>,
->>::ValueCodec;
+type ValueCodec<Table, TC> =
+    <<Table as TableWithBlueprint>::Blueprint as BlueprintInspect<
+        Table,
+        DummyStorage<Column<TC>>,
+    >>::ValueCodec;
 
-impl<Table> TableWithBlueprint for Merkleized<Table>
+impl<Table, TC> TableWithBlueprint for Merkleized<Table>
 where
-    Table: Mappable + MerkleizedTableColumn,
+    Table: Mappable + MerkleizedTableColumn<TableColumn = TC>,
     Table: TableWithBlueprint,
-    Table::Blueprint: BlueprintInspect<Table, DummyStorage<Column>>,
+    TC: core::fmt::Debug + Copy,
+    Table::Blueprint: BlueprintInspect<Table, DummyStorage<Column<TC>>>,
 {
     type Blueprint = Sparse<
-        KeyCodec<Table>,
-        ValueCodec<Table>,
+        KeyCodec<Table, TC>,
+        ValueCodec<Table, TC>,
         MerkleMetadata,
         MerkleData<Table>,
         KeyConverter<Table>,
     >;
-    type Column = Column;
+    type Column = Column<TC>;
 
     fn column() -> Self::Column {
         Column::TableColumn(Table::table_column())

crates/proof_system/global_merkle_root/storage/src/merkle/smt.rs

@@ -1,5 +1,8 @@
 use crate::{
-    column::Column,
+    column::{
+        Column,
+        TableColumn,
+    },
     merkle::MerkleizedTableColumn,
 };
 use fuel_core_storage::{
@@ -25,14 +28,15 @@ impl<Table> Mappable for MerkleData<Table> {
     type OwnedValue = Self::Value;
 }
 
-impl<Table> TableWithBlueprint for MerkleData<Table>
+impl<Table, TC> TableWithBlueprint for MerkleData<Table>
 where
-    Table: MerkleizedTableColumn,
+    Table: MerkleizedTableColumn<TableColumn = TC>,
+    TC: core::fmt::Debug + Copy,
 {
     type Blueprint = Plain<Raw, Postcard>;
-    type Column = Column;
+    type Column = Column<TC>;
 
-    fn column() -> Column {
+    fn column() -> Column<TC> {
         Column::MerkleDataColumn(Table::table_column())
     }
 }
@@ -49,9 +53,9 @@ impl Mappable for MerkleMetadata {
 
 impl TableWithBlueprint for MerkleMetadata {
     type Blueprint = Plain<Primitive<4>, Postcard>;
-    type Column = Column;
+    type Column = Column<TableColumn>;
 
-    fn column() -> Column {
+    fn column() -> Self::Column {
         Column::MerkleMetadataColumn
     }
 }

crates/proof_system/global_merkle_root/storage/src/structured_storage/blobs.rs

@@ -5,6 +5,8 @@ use crate::{
 use fuel_core_storage::tables::BlobData;
 
 impl MerkleizedTableColumn for BlobData {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::Blobs
     }

crates/proof_system/global_merkle_root/storage/src/structured_storage/coins.rs

@@ -5,6 +5,8 @@ use crate::{
 use fuel_core_storage::tables::Coins;
 
 impl MerkleizedTableColumn for Coins {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::Coins
     }

crates/proof_system/global_merkle_root/storage/src/structured_storage/contracts.rs

@@ -8,12 +8,16 @@ use fuel_core_storage::tables::{
 };
 
 impl MerkleizedTableColumn for ContractsRawCode {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::ContractsRawCode
     }
 }
 
 impl MerkleizedTableColumn for ContractsLatestUtxo {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::ContractsLatestUtxo
     }

crates/proof_system/global_merkle_root/storage/src/structured_storage/messages.rs

@@ -5,6 +5,8 @@ use crate::{
 use fuel_core_storage::tables::Messages;
 
 impl MerkleizedTableColumn for Messages {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::Messages
     }

crates/proof_system/global_merkle_root/storage/src/structured_storage/transactions.rs

@@ -5,6 +5,8 @@ use crate::{
 use fuel_core_storage::tables::ProcessedTransactions;
 
 impl MerkleizedTableColumn for ProcessedTransactions {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::ProcessedTransactions
     }

crates/proof_system/global_merkle_root/storage/src/structured_storage/upgrades.rs

@@ -9,18 +9,24 @@ use fuel_core_storage::tables::{
 };
 
 impl MerkleizedTableColumn for ConsensusParametersVersions {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::ConsensusParametersVersions
     }
 }
 
 impl MerkleizedTableColumn for StateTransitionBytecodeVersions {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::StateTransitionBytecodeVersions
     }
 }
 
 impl MerkleizedTableColumn for UploadedBytecodes {
+    type TableColumn = TableColumn;
+
     fn table_column() -> TableColumn {
         TableColumn::UploadedBytecodes
     }