diff --git a/examples/erc721-metadata/tests/erc721.rs b/examples/erc721-metadata/tests/erc721.rs index 67cb60a2..9e7d7f73 100644 --- a/examples/erc721-metadata/tests/erc721.rs +++ b/examples/erc721-metadata/tests/erc721.rs @@ -4,7 +4,6 @@ use abi::Erc721; use alloy::{ primitives::{Address, U256}, sol, - sol_types::SolValue, }; use e2e::{receipt, watch, Account, EventExt, ReceiptExt, Revert}; @@ -46,14 +45,14 @@ async fn constructs(alice: Account) -> eyre::Result<()> { .address()?; let contract = Erc721::new(contract_addr, &alice.wallet); - // let Erc721::nameReturn { name } = contract.name().call().await?; - // let Erc721::symbolReturn { symbol } = contract.symbol().call().await?; - // let Erc721::baseUriReturn { baseURI } = contract.baseUri().call().await?; - // - // assert_eq!(TOKEN_NAME.to_owned(), name); - // assert_eq!(TOKEN_SYMBOL.to_owned(), symbol); - // assert_eq!(base_uri.to_owned(), baseURI); - // + let Erc721::nameReturn { name } = contract.name().call().await?; + let Erc721::symbolReturn { symbol } = contract.symbol().call().await?; + let Erc721::baseUriReturn { baseURI } = contract.baseUri().call().await?; + + assert_eq!(TOKEN_NAME.to_owned(), name); + assert_eq!(TOKEN_SYMBOL.to_owned(), symbol); + assert_eq!(base_uri.to_owned(), baseURI); + Ok(()) } @@ -69,9 +68,9 @@ async fn constructs_with_base_uri(alice: Account) -> eyre::Result<()> { .address()?; let contract = Erc721::new(contract_addr, &alice.wallet); - // let Erc721::baseUriReturn { baseURI } = contract.baseUri().call().await?; - // - // assert_eq!(base_uri.to_owned(), baseURI); + let Erc721::baseUriReturn { baseURI } = contract.baseUri().call().await?; + + assert_eq!(base_uri.to_owned(), baseURI); Ok(()) } @@ -127,12 +126,6 @@ async fn return_empty_token_uri_when_without_base_uri_and_token_uri( let Erc721::tokenURIReturn { tokenURI } = contract.tokenURI(token_id).call().await?; - let expected = String::from("test string"); - let encoded = expected.abi_encode(); - - let decoded: String = - SolValue::abi_decode(&encoded, true).expect("should decode"); - assert_eq!(expected, decoded); assert_eq!("", tokenURI); Ok(()) @@ -157,10 +150,10 @@ async fn return_token_uri_with_base_uri_and_without_token_uri( let _ = watch!(contract.mint(alice.address(), token_id))?; - // let Erc721::tokenURIReturn { tokenURI } = - // contract.tokenURI(token_id).call().await?; - // - // assert_eq!(base_uri.to_owned() + &token_id.to_string(), tokenURI); + let Erc721::tokenURIReturn { tokenURI } = + contract.tokenURI(token_id).call().await?; + + assert_eq!(base_uri.to_owned() + &token_id.to_string(), tokenURI); Ok(()) } @@ -191,10 +184,10 @@ async fn return_token_uri_with_base_uri_and_token_uri( assert!(receipt.emits(Erc721::MetadataUpdate { tokenId: token_id })); - // let Erc721::tokenURIReturn { tokenURI } = - // contract.tokenURI(token_id).call().await?; - // - // assert_eq!(base_uri.to_owned() + &token_uri, tokenURI); + let Erc721::tokenURIReturn { tokenURI } = + contract.tokenURI(token_id).call().await?; + + assert_eq!(base_uri.to_owned() + &token_uri, tokenURI); Ok(()) } @@ -234,10 +227,10 @@ async fn set_token_uri_before_mint(alice: Account) -> eyre::Result<()> { let _ = watch!(contract.mint(alice.address(), token_id))?; - // let Erc721::tokenURIReturn { tokenURI } = - // contract.tokenURI(token_id).call().await?; - // - // assert_eq!(base_uri.to_owned() + &token_uri, tokenURI); + let Erc721::tokenURIReturn { tokenURI } = + contract.tokenURI(token_id).call().await?; + + assert_eq!(base_uri.to_owned() + &token_uri, tokenURI); Ok(()) } @@ -293,9 +286,9 @@ async fn return_token_uri_after_burn_and_remint( contract.ownerOf(token_id).call().await?; assert_eq!(alice_addr, owner_of); - // let Erc721::tokenURIReturn { tokenURI } = - // contract.tokenURI(token_id).call().await?; - // - // assert_eq!(base_uri.to_owned() + &token_id.to_string(), tokenURI); + let Erc721::tokenURIReturn { tokenURI } = + contract.tokenURI(token_id).call().await?; + + assert_eq!(base_uri.to_owned() + &token_id.to_string(), tokenURI); Ok(()) }