Rename vm to namespace, and clean up some dead code

Closes #1023

sequencer/api/availability.toml

@@ -2,7 +2,7 @@
 PATH = ["block/:height/namespace/:namespace"]
 ":height" = "Integer"
 ":namespace" = "Integer"
-DOC = "Get the namespace proof for a set of VM transactions and the NMT root"
+DOC = "Get the transactions in a namespace of the given block, along with a proof."
 
 [route.gettimestampwindow]
 PATH = [

sequencer/src/api.rs

@@ -89,7 +89,7 @@ mod test_helpers {
         persistence::{no_storage::NoStorage, SequencerPersistence},
         state::BlockMerkleTree,
         testing::{wait_for_decide_on_handle, TestConfig},
-        Transaction, VmId,
+        Transaction,
     };
     use async_compatibility_layer::logging::{setup_backtrace, setup_logging};
     use async_std::task::sleep;
@@ -215,7 +215,7 @@ mod test_helpers {
         setup_logging();
         setup_backtrace();
 
-        let txn = Transaction::new(VmId(0), vec![1, 2, 3, 4]);
+        let txn = Transaction::new(Default::default(), vec![1, 2, 3, 4]);
 
         let port = pick_unused_port().expect("No ports free");
 
@@ -410,7 +410,7 @@ mod api_tests {
     use super::*;
     use crate::{
         testing::{wait_for_decide_on_handle, TestConfig},
-        Header, Transaction, VmId,
+        Header, Transaction,
     };
     use async_compatibility_layer::logging::{setup_backtrace, setup_logging};
     use async_std::task::sleep;
@@ -456,7 +456,7 @@ mod api_tests {
         setup_backtrace();
 
         let vid = vid_scheme(5);
-        let txn = Transaction::new(VmId(0), vec![1, 2, 3, 4]);
+        let txn = Transaction::new(Default::default(), vec![1, 2, 3, 4]);
 
         // Start query service.
         let port = pick_unused_port().expect("No ports free");
@@ -498,18 +498,19 @@ mod api_tests {
         let mut found_txn = false;
         let mut found_empty_block = false;
         for block_num in 0..=block_height {
+            let header: Header = client
+                .get(&format!("availability/header/{block_num}"))
+                .send()
+                .await
+                .unwrap();
             let ns_query_res: NamespaceProofQueryData = client
                 .get(&format!("availability/block/{block_num}/namespace/0"))
                 .send()
                 .await
                 .unwrap();
             ns_query_res
                 .proof
-                .verify(
-                    &vid,
-                    &ns_query_res.header.payload_commitment,
-                    &ns_query_res.header.ns_table,
-                )
+                .verify(&vid, &header.payload_commitment, &header.ns_table)
                 .unwrap();
 
             found_empty_block = found_empty_block || ns_query_res.transactions.is_empty();

sequencer/src/api/endpoints.rs

@@ -10,7 +10,7 @@ use crate::{
     block::payload::{parse_ns_payload, NamespaceProof},
     network,
     state::{BlockMerkleTree, FeeAccountProof, ValidatedState},
-    Header, SeqTypes, Transaction, VmId,
+    Header, NamespaceId, SeqTypes, Transaction,
 };
 use async_std::sync::{Arc, RwLock};
 use commit::Committable;
@@ -32,7 +32,6 @@ use tide_disco::{
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NamespaceProofQueryData {
     pub proof: NamespaceProof,
-    pub header: Header,
     pub transactions: Vec<Transaction>,
 }
 
@@ -80,7 +79,8 @@ where
     api.get("getnamespaceproof", move |req, state| {
         async move {
             let height: usize = req.integer_param("height")?;
-            let ns_id = VmId(req.integer_param("namespace")?);
+            let ns_id: u64 = req.integer_param("namespace")?;
+            let ns_id = NamespaceId::from(ns_id);
             let (block, common) = try_join!(
                 async move {
                     state
@@ -129,7 +129,6 @@ where
             Ok(NamespaceProofQueryData {
                 transactions,
                 proof,
-                header: block.header().clone(),
             })
         }
         .boxed()

sequencer/src/bin/submit-transactions.rs

@@ -237,7 +237,7 @@ async fn submit_transactions(
         let hash = tx.commit();
         tracing::info!(
             "submitting transaction {hash} for namespace {} of size {}",
-            tx.vm(),
+            tx.namespace(),
             tx.payload().len()
         );
         if let Err(err) = client
@@ -271,13 +271,13 @@ async fn server(port: u16) {
 }
 
 fn random_transaction(opt: &Options, rng: &mut ChaChaRng) -> Transaction {
-    let vm = rng.gen_range(opt.min_namespace..=opt.max_namespace);
+    let namespace = rng.gen_range(opt.min_namespace..=opt.max_namespace);
 
     let len = rng.gen_range(opt.min_size..=opt.max_size);
     let mut payload = vec![0; len];
     rng.fill_bytes(&mut payload);
 
-    Transaction::new(vm.into(), payload)
+    Transaction::new(namespace.into(), payload)
 }
 
 fn random_seed() -> u64 {

sequencer/src/block/entry.rs

@@ -1,5 +1,5 @@
 use super::{Deserialize, Serialize};
-use crate::VmId;
+use crate::NamespaceId;
 use core::fmt;
 use std::mem::size_of;
 
@@ -69,17 +69,17 @@ impl TryFrom<TxTableEntry> for usize {
     }
 }
 
-impl TryFrom<VmId> for TxTableEntry {
+impl TryFrom<NamespaceId> for TxTableEntry {
     type Error = <TxTableEntryWord as TryFrom<u64>>::Error;
 
-    fn try_from(value: VmId) -> Result<Self, Self::Error> {
-        TxTableEntryWord::try_from(value.0).map(Self)
+    fn try_from(value: NamespaceId) -> Result<Self, Self::Error> {
+        TxTableEntryWord::try_from(u64::from(value)).map(Self)
     }
 }
-impl TryFrom<TxTableEntry> for VmId {
+impl TryFrom<TxTableEntry> for NamespaceId {
     type Error = <u64 as TryFrom<TxTableEntryWord>>::Error;
 
     fn try_from(value: TxTableEntry) -> Result<Self, Self::Error> {
-        Ok(Self(From::from(value.0)))
+        Ok((value.0 as u64).into())
     }
 }