fix typo and add RegistrationStatus enum

Signed-off-by: William Hankins <william@sundae.fi>

Author: whankinsiv

common/src/queries/accounts.rs

@@ -118,7 +118,17 @@ pub struct RegistrationUpdate {
     #[n(0)]
     pub tx_identifier: TxIdentifier,
     #[n(1)]
-    pub deregistered: bool,
+    pub status: RegistrationStatus,
+}
+
+#[derive(
+    Debug, Clone, serde::Serialize, serde::Deserialize, minicbor::Decode, minicbor::Encode,
+)]
+pub enum RegistrationStatus {
+    #[n(0)]
+    Registered,
+    #[n(1)]
+    Deregistered,
 }
 
 #[derive(

modules/historical_accounts_state/src/immutable_historical_account_store.rs

@@ -270,8 +270,8 @@ impl ImmutableHistoricalAccountStore {
         block_deltas: Vec<HashMap<StakeAddress, AccountEntry>>,
     ) -> HashMap<StakeAddress, AccountEntry> {
         block_deltas.into_par_iter().reduce(HashMap::new, |mut acc, block_map| {
-            for (accont, entry) in block_map {
-                let agg_entry = acc.entry(accont).or_default();
+            for (account, entry) in block_map {
+                let agg_entry = acc.entry(account).or_default();
 
                 Self::extend_opt_vec(&mut agg_entry.reward_history, entry.reward_history);
                 Self::extend_opt_vec(

modules/historical_accounts_state/src/state.rs

@@ -7,7 +7,9 @@ use acropolis_common::{
     messages::{
         AddressDeltasMessage, StakeRewardDeltasMessage, TxCertificatesMessage, WithdrawalsMessage,
     },
-    queries::accounts::{AccountWithdrawal, DelegationUpdate, RegistrationUpdate},
+    queries::accounts::{
+        AccountWithdrawal, DelegationUpdate, RegistrationStatus, RegistrationUpdate,
+    },
     BlockInfo, InstantaneousRewardTarget, PoolId, ShelleyAddress, StakeAddress, StakeCredential,
     TxCertificate, TxIdentifier,
 };
@@ -131,14 +133,14 @@ impl State {
                     self.handle_stake_registration_change(
                         &sc.stake_address,
                         &sc.tx_identifier,
-                        false,
+                        RegistrationStatus::Registered,
                     );
                 }
                 TxCertificate::StakeDeregistration(sc) => {
                     self.handle_stake_registration_change(
                         &sc.stake_address,
                         &sc.tx_identifier,
-                        true,
+                        RegistrationStatus::Deregistered,
                     );
                 }
 
@@ -147,14 +149,14 @@ impl State {
                     self.handle_stake_registration_change(
                         &reg.cert.stake_address,
                         &reg.tx_identifier,
-                        false,
+                        RegistrationStatus::Registered,
                     );
                 }
                 TxCertificate::Deregistration(dreg) => {
                     self.handle_stake_registration_change(
                         &dreg.cert.stake_address,
                         &dreg.tx_identifier,
-                        true,
+                        RegistrationStatus::Deregistered,
                     );
                 }
 
@@ -163,7 +165,7 @@ impl State {
                     self.handle_stake_registration_change(
                         &delegation.cert.stake_address,
                         &delegation.tx_identifier,
-                        false,
+                        RegistrationStatus::Registered,
                     );
                     self.handle_stake_delegation(
                         &delegation.cert.stake_address,
@@ -176,7 +178,7 @@ impl State {
                     self.handle_stake_registration_change(
                         &delegation.cert.stake_address,
                         &delegation.tx_identifier,
-                        false,
+                        RegistrationStatus::Registered,
                     );
                     self.handle_stake_delegation(
                         &delegation.cert.stake_address,
@@ -207,7 +209,7 @@ impl State {
                     self.handle_stake_registration_change(
                         &delegation.cert.stake_address,
                         &delegation.tx_identifier,
-                        false,
+                        RegistrationStatus::Registered,
                     );
                 }
 
@@ -299,13 +301,13 @@ impl State {
         &mut self,
         account: &StakeAddress,
         tx_identifier: &TxIdentifier,
-        deregistered: bool,
+        status: RegistrationStatus,
     ) {
         let volatile = self.volatile.window.back_mut().expect("window should never be empty");
         let entry = volatile.entry(account.clone()).or_default();
         let update = RegistrationUpdate {
             tx_identifier: *tx_identifier,
-            deregistered,
+            status,
         };
         entry.registration_history.get_or_insert_with(Vec::new).push(update);
     }