Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: starknet ampd ethers_core and cosmrs types #26

Merged
merged 1 commit into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ampd/src/handlers/starknet_verify_msg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ use std::convert::TryInto;
use async_trait::async_trait;
use axelar_wasm_std::voting::{PollId, Vote};
use cosmrs::cosmwasm::MsgExecuteContract;
use cosmrs::{tx::Msg, Any};
use cosmrs::tx::Msg;
use cosmrs::Any;
use error_stack::{FutureExt, ResultExt};
use events::Error::EventTypeMismatch;
use events_derive::try_from;
Expand Down Expand Up @@ -164,7 +165,7 @@ where
mod tests {
use base64::engine::general_purpose::STANDARD;
use base64::Engine;
use ethers::types::H256;
use ethers_core::types::H256;
use events::Event;
use mockall::predicate::eq;
use tendermint::abci;
Expand Down
4 changes: 2 additions & 2 deletions ampd/src/starknet/events/contract_call.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::num::TryFromIntError;

use ethers::types::H256;
use ethers_core::types::H256;
use starknet_core::types::ValueOutOfRangeError;
use starknet_core::utils::{parse_cairo_short_string, ParseCairoShortStringError};
use thiserror::Error;
Expand Down Expand Up @@ -140,7 +140,7 @@ impl TryFrom<starknet_core::types::Event> for ContractCallEvent {
mod tests {
use std::str::FromStr;

use ethers::types::H256;
use ethers_core::types::H256;
use starknet_core::types::{FieldElement, FromStrError, ValueOutOfRangeError};
use starknet_core::utils::starknet_keccak;

Expand Down
2 changes: 1 addition & 1 deletion ampd/src/starknet/json_rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ where
mod test {

use axum::async_trait;
use ethers::types::H256;
use ethers_core::types::H256;
use serde::de::DeserializeOwned;
use serde::Serialize;
use starknet_core::types::FieldElement;
Expand Down
2 changes: 1 addition & 1 deletion ampd/src/starknet/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl PartialEq<Message> for ContractCallEvent {
#[cfg(test)]
mod tests {
use axelar_wasm_std::voting::Vote;
use ethers::types::H256;
use ethers_core::types::H256;

use super::verify_msg;
use crate::handlers::starknet_verify_msg::Message;
Expand Down
Loading