Skip to content

Commit

Permalink
Merge branch 'tiago/remove-native-vp-addr' (#1725)
Browse files Browse the repository at this point in the history
* tiago/remove-native-vp-addr:
  changelog: add #1725
  Remove `ADDR` associated type from native VPs
  • Loading branch information
tzemanovic committed Jul 24, 2023
2 parents b6714b5 + 6552a5a commit 84b7492
Show file tree
Hide file tree
Showing 11 changed files with 386 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Removed the associated type for an address from `trait NativeVp`.
([\#1725](https://github.com/anoma/namada/pull/1725))
6 changes: 2 additions & 4 deletions shared/src/ledger/ibc/vp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use namada_core::ledger::ibc::{
use namada_core::ledger::storage::write_log::StorageModification;
use namada_core::ledger::storage::{self as ledger_storage, StorageHasher};
use namada_core::proto::Tx;
use namada_core::types::address::{Address, InternalAddress};
use namada_core::types::address::Address;
use namada_core::types::storage::Key;
use namada_proof_of_stake::read_pos_params;
use thiserror::Error;
Expand Down Expand Up @@ -65,8 +65,6 @@ where
{
type Error = Error;

const ADDR: InternalAddress = InternalAddress::Ibc;

fn validate_tx(
&self,
tx_data: &Tx,
Expand Down Expand Up @@ -307,8 +305,8 @@ mod tests {
};
use super::{get_dummy_header, *};
use crate::core::ledger::storage::testing::TestWlStorage;
use crate::core::types::address::nam;
use crate::core::types::address::testing::established_address_1;
use crate::core::types::address::{nam, InternalAddress};
use crate::core::types::storage::Epoch;
use crate::ibc::applications::transfer::acknowledgement::TokenTransferAcknowledgement;
use crate::ibc::applications::transfer::coin::PrefixedCoin;
Expand Down
Loading

0 comments on commit 84b7492

Please sign in to comment.