Make proposal_id a required field in gov proposals

anoma · Jan 5, 2024 · 5f735e0 · 5f735e0
1 parent 63e6611
commit 5f735e0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 22 deletions.
diff --git a/apps/src/lib/bench_utils.rs b/apps/src/lib/bench_utils.rs
@@ -244,7 +244,7 @@ impl Default for BenchShell {
         let signed_tx = bench_shell.generate_tx(
             TX_INIT_PROPOSAL_WASM,
             InitProposalData {
-                id: None,
+                id: 0,
                 content: content_section.get_hash(),
                 author: defaults::albert_address(),
                 r#type: ProposalType::Default(None),

diff --git a/apps/src/lib/node/ledger/shell/finalize_block.rs b/apps/src/lib/node/ledger/shell/finalize_block.rs
@@ -1612,7 +1612,7 @@ mod test_finalize_block {
             shell.proposal_data.insert(proposal_id);
 
             let proposal = InitProposalData {
-                id: Some(proposal_id),
+                id: proposal_id,
                 content: Hash::default(),
                 author: validator.clone(),
                 voting_start_epoch: Epoch::default(),

diff --git a/benches/native_vps.rs b/benches/native_vps.rs
@@ -126,7 +126,7 @@ fn governance(c: &mut Criterion) {
                 shell.generate_tx(
                     TX_INIT_PROPOSAL_WASM,
                     InitProposalData {
-                        id: None,
+                        id: 0,
                         content: content_section.get_hash(),
                         author: defaults::albert_address(),
                         r#type: ProposalType::Default(None),
@@ -178,7 +178,7 @@ fn governance(c: &mut Criterion) {
                 shell.generate_tx(
                     TX_INIT_PROPOSAL_WASM,
                     InitProposalData {
-                        id: Some(1),
+                        id: 1,
                         content: content_section.get_hash(),
                         author: defaults::albert_address(),
                         r#type: ProposalType::Default(Some(
@@ -250,7 +250,7 @@ fn governance(c: &mut Criterion) {
 //      let governance_proposal = shell.generate_tx(
 //          TX_INIT_PROPOSAL_WASM,
 //          InitProposalData {
-//              id: None,
+//              id: 0,
 //              content: content_section.get_hash(),
 //              author: defaults::albert_address(),
 //              r#type: ProposalType::Default(None),

diff --git a/benches/txs.rs b/benches/txs.rs
@@ -462,7 +462,7 @@ fn init_proposal(c: &mut Criterion) {
                             shell.generate_tx(
                                 TX_INIT_PROPOSAL_WASM,
                                 InitProposalData {
-                                    id: None,
+                                    id: 0,
                                     content: content_section.get_hash(),
                                     author: defaults::albert_address(),
                                     r#type: ProposalType::Default(None),
@@ -512,7 +512,7 @@ fn init_proposal(c: &mut Criterion) {
                             shell.generate_tx(
                                 TX_INIT_PROPOSAL_WASM,
                                 InitProposalData {
-                                    id: Some(1),
+                                    id: 1,
                                     content: content_section.get_hash(),
                                     author: defaults::albert_address(),
                                     r#type: ProposalType::Default(Some(

diff --git a/core/src/ledger/governance/cli/onchain.rs b/core/src/ledger/governance/cli/onchain.rs
@@ -20,7 +20,7 @@ use crate::types::storage::Epoch;
 /// The proposal structure
 pub struct OnChainProposal {
     /// The proposal id
-    pub id: Option<u64>,
+    pub id: u64,
     /// The proposal content
     pub content: BTreeMap<String, String>,
     /// The proposal author address

diff --git a/core/src/ledger/storage_api/governance.rs b/core/src/ledger/storage_api/governance.rs
@@ -31,11 +31,10 @@ where
     S: StorageRead + StorageWrite,
 {
     let counter_key = governance_keys::get_counter_key();
-    let proposal_id = if let Some(id) = data.id {
-        id
-    } else {
-        storage.read(&counter_key)?.unwrap()
-    };
+    let proposal_id = storage.read(&counter_key)?.expect(
+        "Storage should have been initialized with an initial governance \
+         proposal id",
+    );
 
     let content_key = governance_keys::get_content_key(proposal_id);
     storage.write_bytes(&content_key, content)?;

diff --git a/core/src/types/transaction/governance.rs b/core/src/types/transaction/governance.rs
@@ -34,7 +34,7 @@ pub enum ProposalError {
 )]
 pub struct InitProposalData {
     /// The proposal id
-    pub id: Option<u64>,
+    pub id: u64,
     /// The proposal content
     pub content: Hash,
     /// The proposal author address
@@ -180,7 +180,7 @@ pub mod tests {
     prop_compose! {
         /// Generate a proposal initialization
         pub fn arb_init_proposal()(
-            id: Option<u64>,
+            id: u64,
             content in arb_hash(),
             author in arb_non_internal_address(),
             r#type in arb_proposal_type(),

diff --git a/light_sdk/src/transaction/governance.rs b/light_sdk/src/transaction/governance.rs
@@ -19,7 +19,7 @@ impl InitProposal {
     /// Build a raw InitProposal transaction from the given parameters
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        id: Option<u64>,
+        id: u64,
         content: Hash,
         author: Address,
         r#type: ProposalType,

diff --git a/sdk/src/signing.rs b/sdk/src/signing.rs
@@ -1086,9 +1086,7 @@ pub async fn to_ledger_vector(
             .hash();
 
         tv.output.push("Type : Init proposal".to_string());
-        if let Some(id) = init_proposal_data.id.as_ref() {
-            tv.output.push(format!("ID : {}", id));
-        }
+        tv.output.push(format!("ID : {}", init_proposal_data.id));
         tv.output.extend(vec![
             format!(
                 "Proposal type : {}",
@@ -1107,9 +1105,8 @@ pub async fn to_ledger_vector(
             format!("Content : {}", HEXLOWER.encode(&extra.0)),
         ]);
 
-        if let Some(id) = init_proposal_data.id.as_ref() {
-            tv.output_expert.push(format!("ID : {}", id));
-        }
+        tv.output_expert
+            .push(format!("ID : {}", init_proposal_data.id));
         tv.output_expert.extend(vec![
             format!(
                 "Proposal type : {}",