Merge branch 'tiago/move-ibc-vp' (#1927)

* origin/tiago/move-ibc-vp:
  Changelog for #1927
  Move the IBC native VP

Author: Fraccaman

.changelog/unreleased/improvements/1927-move-ibc-vp.md

@@ -0,0 +1,2 @@
+- Move the IBC native VP to a different module
+  ([\#1927](https://github.com/anoma/namada/pull/1927))

benches/native_vps.rs

@@ -21,7 +21,7 @@ use namada::ibc::core::ics24_host::identifier::{
 };
 use namada::ledger::gas::{TxGasMeter, VpGasMeter};
 use namada::ledger::governance::GovernanceVp;
-use namada::ledger::ibc::vp::Ibc;
+use namada::ledger::native_vp::ibc::Ibc;
 use namada::ledger::native_vp::multitoken::MultitokenVp;
 use namada::ledger::native_vp::replay_protection::ReplayProtectionVp;
 use namada::ledger::native_vp::{Ctx, NativeVp};

shared/src/ledger/ibc/mod.rs

@@ -1,8 +1,6 @@
 //! IBC integration
 
 pub use namada_core::ledger::ibc::storage;
-pub mod vp;
-
 use namada_core::ledger::ibc::storage::{
     channel_counter_key, client_counter_key, connection_counter_key,
 };

shared/src/ledger/ibc/vp/context.rs renamed to shared/src/ledger/native_vp/ibc/context.rs

@@ -296,15 +296,15 @@ mod tests {
     use prost::Message;
     use sha2::Digest;
 
-    use super::super::storage::{
+    use super::*;
+    use crate::core::ledger::ibc::storage::{
         ack_key, calc_hash, channel_counter_key, channel_key,
         client_connections_key, client_counter_key, client_state_key,
         client_update_height_key, client_update_timestamp_key, commitment_key,
         connection_counter_key, connection_key, consensus_state_key,
         ibc_denom_key, next_sequence_ack_key, next_sequence_recv_key,
         next_sequence_send_key, receipt_key,
     };
-    use super::{get_dummy_header, *};
     use crate::core::ledger::storage::testing::TestWlStorage;
     use crate::core::types::address::testing::{
         established_address_1, established_address_2,

shared/src/ledger/ibc/vp/mod.rs renamed to shared/src/ledger/native_vp/ibc/mod.rs

@@ -2,6 +2,7 @@
 //! as the PoS and IBC modules.
 
 pub mod ethereum_bridge;
+pub mod ibc;
 pub mod multitoken;
 pub mod parameters;
 pub mod replay_protection;

shared/src/ledger/ibc/vp/token.rs renamed to shared/src/ledger/native_vp/ibc/token.rs

@@ -18,10 +18,10 @@ use thiserror::Error;
 
 use crate::ledger::gas::{self, GasMetering, VpGasMeter};
 use crate::ledger::governance::GovernanceVp;
-use crate::ledger::ibc::vp::Ibc;
 use crate::ledger::native_vp::ethereum_bridge::bridge_pool_vp::BridgePoolVp;
 use crate::ledger::native_vp::ethereum_bridge::nut::NonUsableTokens;
 use crate::ledger::native_vp::ethereum_bridge::vp::EthBridge;
+use crate::ledger::native_vp::ibc::Ibc;
 use crate::ledger::native_vp::multitoken::MultitokenVp;
 use crate::ledger::native_vp::parameters::{self, ParametersVp};
 use crate::ledger::native_vp::replay_protection::ReplayProtectionVp;
@@ -66,7 +66,7 @@ pub enum Error {
     #[error("The address {0} doesn't exist")]
     MissingAddress(Address),
     #[error("IBC native VP: {0}")]
-    IbcNativeVpError(crate::ledger::ibc::vp::Error),
+    IbcNativeVpError(crate::ledger::native_vp::ibc::Error),
     #[error("PoS native VP: {0}")]
     PosNativeVpError(pos::vp::Error),
     #[error("PoS native VP panicked")]

shared/src/ledger/native_vp/mod.rs

@@ -56,7 +56,7 @@ pub use namada::ledger::ibc::storage::{
     consensus_state_key, ibc_token, next_sequence_ack_key,
     next_sequence_recv_key, next_sequence_send_key, port_key, receipt_key,
 };
-use namada::ledger::ibc::vp::{
+use namada::ledger::native_vp::ibc::{
     get_dummy_genesis_validator, get_dummy_header as tm_dummy_header, Ibc,
 };
 use namada::ledger::native_vp::multitoken::{
@@ -101,7 +101,7 @@ impl<'a> TestIbcVp<'a> {
     pub fn validate(
         &self,
         tx_data: &Tx,
-    ) -> std::result::Result<bool, namada::ledger::ibc::vp::Error> {
+    ) -> std::result::Result<bool, namada::ledger::native_vp::ibc::Error> {
         self.ibc.validate_tx(
             tx_data,
             self.ibc.ctx.keys_changed,
@@ -132,7 +132,7 @@ impl<'a> TestMultitokenVp<'a> {
 pub fn validate_ibc_vp_from_tx<'a>(
     tx_env: &'a TestTxEnv,
     tx: &'a Tx,
-) -> std::result::Result<bool, namada::ledger::ibc::vp::Error> {
+) -> std::result::Result<bool, namada::ledger::native_vp::ibc::Error> {
     let (verifiers, keys_changed) = tx_env
         .wl_storage
         .write_log

shared/src/ledger/protocol/mod.rs

@@ -24,7 +24,7 @@ mod tests {
     use itertools::Itertools;
     use namada::ibc::core::Msg;
     use namada::ledger::ibc::storage as ibc_storage;
-    use namada::ledger::ibc::vp::{
+    use namada::ledger::native_vp::ibc::{
         get_dummy_header as tm_dummy_header, Error as IbcError,
     };
     use namada::ledger::tx_env::TxEnv;