Revert "Final extraction merge message (#88)" (#89)

This reverts commit 346ee4f.

Cargo.toml

@@ -3,12 +3,12 @@ resolver = "2"
 members = ["lgn-auth", "lgn-messages", "lgn-provers", "lgn-worker"]
 
 [workspace.dependencies]
-mp2_common = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", branch = "feat/merge_table" }
-mp2_v1 = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", branch = "feat/merge_table" }
-parsil = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", branch = "feat/merge_table" }
-verifiable-db = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", branch = "feat/merge_table" }
-ryhope = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", branch = "feat/merge_table" }
-groth16_framework_v1 = { package = "groth16_framework", git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", branch = "feat/merge_table" }
+mp2_common = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", rev = "4d0e96f" }
+mp2_v1 = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", rev = "4d0e96f" }
+parsil = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", rev = "4d0e96f" }
+verifiable-db = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", rev = "4d0e96f" }
+ryhope = { git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", rev = "4d0e96f" }
+groth16_framework_v1 = { package = "groth16_framework", git = "https://github.com/Lagrange-Labs/mapreduce-plonky2.git", rev = "4d0e96f" }
 
 [patch.crates-io]
 plonky2 = { git = "https://github.com/Lagrange-Labs/plonky2", branch = "upstream" }

lgn-messages/src/types/v0/preprocessing/keys.rs

@@ -7,13 +7,15 @@ use serde_derive::{Deserialize, Serialize};
 
 use crate::types::Position;
 
-pub type BlockNr = u64;
 pub type ChainId = u64;
-pub type Contract = Address;
-pub type MptNodeHash = String;
+
 pub type QueryId = String;
-pub type TableId = u64;
-pub type TableHash = u64;
+
+pub type MptNodeHash = String;
+
+pub type BlockNr = u64;
+
+pub type Contract = Address;
 
 /// Level in binary tree
 pub type Level = usize;

lgn-messages/src/types/v1/preprocessing/db_keys.rs

@@ -1,14 +1,20 @@
-use crate::types::v0::preprocessing::keys::{BlockNr, TableId};
 use crate::types::v1::preprocessing::KEYS_PREPROCESSING_PREFIX;
 use object_store::path::Path;
 use serde_derive::{Deserialize, Serialize};
 use std::fmt::Display;
 
+type BlockNr = u64;
+
+type TableId = u64;
+
 type RowId = String;
+
 type CellId = usize;
 
 const CELL_PREFIX: &str = "CELL";
+
 const ROW_PREFIX: &str = "ROW";
+
 const BLOCK_PREFIX: &str = "DB_BLOCK";
 
 #[derive(Debug, Clone, PartialEq, PartialOrd, Ord, Eq, Hash, Serialize, Deserialize)]