PoS crate refactors

apps/src/lib/node/ledger/shell/finalize_block.rs

@@ -12,11 +12,13 @@ use namada::ledger::storage::EPOCH_SWITCH_BLOCKS_DELAY;
 use namada::ledger::storage_api::token::credit_tokens;
 use namada::ledger::storage_api::{pgf, StorageRead, StorageWrite};
 use namada::ledger::{inflation, protocol, replay_protection};
-use namada::proof_of_stake::{
-    delegator_rewards_products_handle, find_validator_by_raw_hash,
-    read_last_block_proposer_address, read_pos_params, read_total_stake,
-    read_validator_stake, rewards_accumulator_handle,
+use namada::proof_of_stake::storage::{
+    delegator_rewards_products_handle, rewards_accumulator_handle,
     validator_commission_rate_handle, validator_rewards_products_handle,
+};
+use namada::proof_of_stake::{
+    find_validator_by_raw_hash, read_last_block_proposer_address,
+    read_pos_params, read_total_stake, read_validator_stake,
     write_last_block_proposer_address,
 };
 use namada::types::address::Address;
@@ -1084,17 +1086,20 @@ mod test_finalize_block {
     use namada::ledger::storage_api;
     use namada::ledger::storage_api::StorageWrite;
     use namada::proof_of_stake::storage::{
+        enqueued_slashes_handle, rewards_accumulator_handle,
+        validator_consensus_key_handle, validator_rewards_products_handle,
+        validator_slashes_handle, validator_state_handle,
+    };
+    use namada::proof_of_stake::storage_key::{
         is_validator_slashes_key, slashes_prefix,
     };
     use namada::proof_of_stake::types::{
         BondId, SlashType, ValidatorState, WeightedValidator,
     };
     use namada::proof_of_stake::{
-        enqueued_slashes_handle, get_num_consensus_validators,
-        read_consensus_validator_set_addresses_with_stake,
-        rewards_accumulator_handle, unjail_validator,
-        validator_consensus_key_handle, validator_rewards_products_handle,
-        validator_slashes_handle, validator_state_handle, write_pos_params,
+        get_num_consensus_validators,
+        read_consensus_validator_set_addresses_with_stake, unjail_validator,
+        write_pos_params,
     };
     use namada::proto::{Code, Data, Section, Signature};
     use namada::types::dec::POS_DECIMAL_PRECISION;
@@ -1946,11 +1951,10 @@ mod test_finalize_block {
         let validator = shell.mode.get_validator_address().unwrap();
         let pos_params =
             namada_proof_of_stake::read_pos_params(&shell.wl_storage).unwrap();
-        let consensus_key =
-            namada_proof_of_stake::validator_consensus_key_handle(validator)
-                .get(&shell.wl_storage, Epoch::default(), &pos_params)
-                .unwrap()
-                .unwrap();
+        let consensus_key = validator_consensus_key_handle(validator)
+            .get(&shell.wl_storage, Epoch::default(), &pos_params)
+            .unwrap()
+            .unwrap();
         let proposer_address = HEXUPPER
             .decode(consensus_key.tm_raw_hash().as_bytes())
             .unwrap();
@@ -2602,11 +2606,10 @@ mod test_finalize_block {
         let validator = shell.mode.get_validator_address().unwrap().to_owned();
         let pos_params =
             namada_proof_of_stake::read_pos_params(&shell.wl_storage).unwrap();
-        let consensus_key =
-            namada_proof_of_stake::validator_consensus_key_handle(&validator)
-                .get(&shell.wl_storage, Epoch::default(), &pos_params)
-                .unwrap()
-                .unwrap();
+        let consensus_key = validator_consensus_key_handle(&validator)
+            .get(&shell.wl_storage, Epoch::default(), &pos_params)
+            .unwrap()
+            .unwrap();
         let proposer_address = HEXUPPER
             .decode(consensus_key.tm_raw_hash().as_bytes())
             .unwrap();
@@ -3369,7 +3372,7 @@ mod test_finalize_block {
             .unwrap();
         assert_eq!(last_slash, Some(misbehavior_epoch));
         assert!(
-            namada_proof_of_stake::validator_slashes_handle(&val1.address)
+            validator_slashes_handle(&val1.address)
                 .is_empty(&shell.wl_storage)
                 .unwrap()
         );
@@ -3446,7 +3449,7 @@ mod test_finalize_block {
             .unwrap()
         );
         assert!(
-            namada_proof_of_stake::validator_slashes_handle(&val1.address)
+            validator_slashes_handle(&val1.address)
                 .is_empty(&shell.wl_storage)
                 .unwrap()
         );
@@ -3528,8 +3531,7 @@ mod test_finalize_block {
 
         // There should be 2 slashes processed for the validator, each with rate
         // equal to the cubic slashing rate
-        let val_slashes =
-            namada_proof_of_stake::validator_slashes_handle(&val1.address);
+        let val_slashes = validator_slashes_handle(&val1.address);
         assert_eq!(val_slashes.len(&shell.wl_storage).unwrap(), 2u64);
         let is_rate_good = val_slashes
             .iter(&shell.wl_storage)

apps/src/lib/node/ledger/shell/mod.rs

@@ -1548,7 +1548,7 @@ mod test_utils {
     };
     use namada::ledger::storage_api::StorageWrite;
     use namada::proof_of_stake::parameters::PosParams;
-    use namada::proof_of_stake::validator_consensus_key_handle;
+    use namada::proof_of_stake::storage::validator_consensus_key_handle;
     use namada::proto::{Code, Data};
     use namada::tendermint_proto::abci::VoteInfo;
     use namada::types::address;

apps/src/lib/node/ledger/shell/prepare_proposal.rs

@@ -514,9 +514,9 @@ mod test_prepare_proposal {
     use namada::ledger::gas::Gas;
     use namada::ledger::pos::PosQueries;
     use namada::ledger::replay_protection;
+    use namada::proof_of_stake::storage::consensus_validator_set_handle;
     use namada::proof_of_stake::types::WeightedValidator;
     use namada::proof_of_stake::{
-        consensus_validator_set_handle,
         read_consensus_validator_set_addresses_with_stake, Epoch,
     };
     #[cfg(feature = "abcipp")]

apps/src/lib/node/ledger/shell/testing/node.rs

@@ -14,11 +14,9 @@ use namada::ledger::storage::{
     LastBlock, Sha256Hasher, EPOCH_SWITCH_BLOCKS_DELAY,
 };
 use namada::proof_of_stake::pos_queries::PosQueries;
+use namada::proof_of_stake::read_consensus_validator_set_addresses_with_stake;
+use namada::proof_of_stake::storage::validator_consensus_key_handle;
 use namada::proof_of_stake::types::WeightedValidator;
-use namada::proof_of_stake::{
-    read_consensus_validator_set_addresses_with_stake,
-    validator_consensus_key_handle,
-};
 use namada::tendermint_proto::abci::VoteInfo;
 use namada::tendermint_rpc::endpoint::abci_info;
 use namada::tendermint_rpc::SimpleRequest;

apps/src/lib/node/ledger/shell/vote_extensions/bridge_pool_vext.rs

@@ -277,13 +277,13 @@ mod test_bp_vote_extensions {
     use namada::ledger::eth_bridge::EthBridgeQueries;
     use namada::ledger::pos::PosQueries;
     use namada::ledger::storage_api::StorageWrite;
+    use namada::proof_of_stake::storage::consensus_validator_set_handle;
     use namada::proof_of_stake::types::{
         Position as ValidatorPosition, WeightedValidator,
     };
     use namada::proof_of_stake::{
-        become_validator, consensus_validator_set_handle,
-        read_consensus_validator_set_addresses_with_stake, BecomeValidator,
-        Epoch,
+        become_validator, read_consensus_validator_set_addresses_with_stake,
+        BecomeValidator, Epoch,
     };
     use namada::proto::{SignableEthMessage, Signed};
     use namada::tendermint_proto::abci::VoteInfo;

apps/src/lib/node/ledger/shell/vote_extensions/eth_events.rs

@@ -454,11 +454,9 @@ mod test_vote_extensions {
     };
     use namada::eth_bridge::storage::bridge_pool;
     use namada::ledger::pos::PosQueries;
+    use namada::proof_of_stake::read_consensus_validator_set_addresses_with_stake;
+    use namada::proof_of_stake::storage::consensus_validator_set_handle;
     use namada::proof_of_stake::types::WeightedValidator;
-    use namada::proof_of_stake::{
-        consensus_validator_set_handle,
-        read_consensus_validator_set_addresses_with_stake,
-    };
     #[cfg(feature = "abcipp")]
     use namada::proto::{SignableEthMessage, Signed};
     use namada::tendermint_proto::abci::VoteInfo;

apps/src/lib/node/ledger/shell/vote_extensions/val_set_update.rs

@@ -313,9 +313,9 @@ mod test_vote_extensions {
     };
     use namada::ledger::eth_bridge::EthBridgeQueries;
     use namada::ledger::pos::PosQueries;
+    use namada::proof_of_stake::storage::consensus_validator_set_handle;
     use namada::proof_of_stake::types::WeightedValidator;
     use namada::proof_of_stake::{
-        consensus_validator_set_handle,
         read_consensus_validator_set_addresses_with_stake, Epoch,
     };
     #[cfg(feature = "abcipp")]

ethereum_bridge/src/storage/eth_bridge_queries.rs

@@ -23,7 +23,7 @@ use namada_core::types::voting_power::{
 };
 use namada_proof_of_stake::pos_queries::{ConsensusValidators, PosQueries};
 use namada_proof_of_stake::{
-    validator_eth_cold_key_handle, validator_eth_hot_key_handle,
+    read_validator_eth_cold_key, read_validator_eth_hot_key,
 };
 
 use crate::storage::proof::BridgePoolRootProof;
@@ -293,9 +293,7 @@ where
     ) -> Option<EthAddress> {
         let epoch = epoch
             .unwrap_or_else(|| self.wl_storage.storage.get_current_epoch().0);
-        let params = self.wl_storage.pos_queries().get_pos_params();
-        validator_eth_hot_key_handle(validator)
-            .get(self.wl_storage, epoch, &params)
+        read_validator_eth_hot_key(self.wl_storage, validator, epoch)
             .expect("Should be able to read eth hot key from storage")
             .and_then(|ref pk| pk.try_into().ok())
     }
@@ -310,9 +308,7 @@ where
     ) -> Option<EthAddress> {
         let epoch = epoch
             .unwrap_or_else(|| self.wl_storage.storage.get_current_epoch().0);
-        let params = self.wl_storage.pos_queries().get_pos_params();
-        validator_eth_cold_key_handle(validator)
-            .get(self.wl_storage, epoch, &params)
+        read_validator_eth_cold_key(self.wl_storage, validator, epoch)
             .expect("Should be able to read eth cold key from storage")
             .and_then(|ref pk| pk.try_into().ok())
     }