Skip to content

Commit

Permalink
fix: remove non ampd related changes
Browse files Browse the repository at this point in the history
  • Loading branch information
eloylp committed Feb 5, 2025
1 parent 131aba1 commit 00ed5e3
Showing 1 changed file with 0 additions and 64 deletions.
64 changes: 0 additions & 64 deletions packages/axelar-wasm-std/src/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pub enum AddressFormat {
Eip55,
Sui,
Stellar,
Base58Solana,
Starknet,
}

Expand All @@ -41,16 +40,6 @@ pub fn validate_address(address: &str, format: &AddressFormat) -> Result<(), Err
ScAddress::from_str(address)
.change_context(Error::InvalidAddress(address.to_string()))?;
}
AddressFormat::Base58Solana => {
const SOLANA_PUBKEY_LEN: usize = 32;

let pubkey_vec = bs58::decode(address)
.into_vec()
.change_context(Error::InvalidAddress(address.to_string()))?;
if pubkey_vec.len() != SOLANA_PUBKEY_LEN {
bail!(Error::InvalidAddress(address.to_string()))
}
}
AddressFormat::Starknet => {
CheckedFelt::from_str(address)
.change_context(Error::InvalidAddress(address.to_string()))?;
Expand Down Expand Up @@ -205,59 +194,6 @@ mod tests {
);
}

#[test]
fn validate_solana_address() {
use crate::{address, assert_err_contains};

// Valid Solana address
let addr = "4f3J7t1HgX1t36k6rph2pYJrWxk9uT1RrB2K3nVHDh8D";

assert_ok!(address::validate_address(
addr,
&address::AddressFormat::Base58Solana
));

// Invalid address: contains invalid character '0' (zero)
let invalid_char_addr = "4f3J7t1HgX1t36k6rph2pYJrWxk9uT1RrB2K3nVHDh8D0";
assert_err_contains!(
address::validate_address(invalid_char_addr, &address::AddressFormat::Base58Solana),
address::Error,
address::Error::InvalidAddress(..)
);

// Invalid address: contains invalid character 'O'
let invalid_char_addr2 = "4f3J7t1HgX1t36k6rph2pYJrWxk9uT1RrB2K3nVHDh8DO";
assert_err_contains!(
address::validate_address(invalid_char_addr2, &address::AddressFormat::Base58Solana),
address::Error,
address::Error::InvalidAddress(..)
);

// Invalid address: incorrect length (too short)
let short_addr = "4f3J7t1HgX1t36k6rph2pYJrWxk9uT1RrB2K3nVHDh";
assert_err_contains!(
address::validate_address(short_addr, &address::AddressFormat::Base58Solana),
address::Error,
address::Error::InvalidAddress(..)
);

// Invalid address: incorrect length (too long)
let long_addr = format!("{}A", addr);
assert_err_contains!(
address::validate_address(&long_addr, &address::AddressFormat::Base58Solana),
address::Error,
address::Error::InvalidAddress(..)
);

// Invalid address: contains invalid character 'I'
let invalid_char_addr3 = "4f3J7t1HgX1t36k6rph2pYJrWxk9uT1RrB2K3nVHDh8DI";
assert_err_contains!(
address::validate_address(invalid_char_addr3, &address::AddressFormat::Base58Solana),
address::Error,
address::Error::InvalidAddress(..)
);
}

#[test]
fn validate_starknet_address() {
// 0 prefixed field element
Expand Down

0 comments on commit 00ed5e3

Please sign in to comment.