Skip to content

Commit

Permalink
Fix merge conflicts with main.
Browse files Browse the repository at this point in the history
  • Loading branch information
dowlandaiello committed Sep 6, 2024
1 parent 09c63b5 commit 73c2fbb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion src/utils/queries.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
types::ibc::{get_prefixed_denom, parse_denom_trace},
AUCTIONS_MANAGER_CONTRACT_NAME, TRANSFER_PORT,
TRANSFER_PORT,
};

use super::{
Expand Down
5 changes: 0 additions & 5 deletions src/utils/setup/astroport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,6 @@ impl TestContext {
.src(NEUTRON_CHAIN_NAME)
.contract(TOKEN_REGISTRY_NAME)
.get_cw();
let code_id = contract_a
.code_id
.ok_or(Error::MissingContextVariable(String::from(
"astroport_token_registry::code_id",
)))?;

let contract = contract_a.instantiate(
key,
Expand Down

0 comments on commit 73c2fbb

Please sign in to comment.