Skip to content

Commit

Permalink
feat: 🏗️ bump starknet.rs version to maintain compatibility with Deoxys
Browse files Browse the repository at this point in the history 
bump starknet.rs version to maintain compatibility with Deoxys
  • Loading branch information
@Tbelleng
Tbelleng committed Jan 11, 2024
1 parent 312c313 commit 5b72505
Show file tree
Hide file tree
Showing 19 changed files with 72 additions and 153 deletions.
36 changes: 18 additions & 18 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions unit_tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ serde = "1.0.194"
serde_json = "1.0.110"
tokio = { version = "1", features = ["full"] }
url = "2.5.0"
starknet = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
starknet-core = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
starknet-providers = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
starknet-accounts = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
starknet = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
starknet-core = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
starknet-providers = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
starknet-accounts = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
env_logger = "0.10.1"

[dev-dependencies]
Expand Down
29 changes: 6 additions & 23 deletions unit_tests/tests/test_call.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ use starknet_core::{
utils::get_selector_from_name,
};
use starknet_providers::{
jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
StarknetErrorWithMessage,
jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
};

///
Expand Down Expand Up @@ -39,11 +38,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
}))
);
Some(ProviderError::StarknetError(StarknetError::BlockNotFound)))
}

///
Expand Down Expand Up @@ -71,10 +66,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
}))
Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
);
}

Expand Down Expand Up @@ -105,10 +97,7 @@ async fn fail_invalid_contract_entry_point_selector(

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::ContractError)
}))
Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
);
}

Expand Down Expand Up @@ -137,10 +126,7 @@ async fn fail_missing_contract_call_data(clients: HashMap<String, JsonRpcClient<

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::ContractError)
}))
Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
);
}

Expand Down Expand Up @@ -198,10 +184,7 @@ async fn fail_too_many_call_data(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::ContractError)
}))
Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand Down
4 changes: 2 additions & 2 deletions unit_tests/tests/test_estimate_fee.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use common::*;
use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
use starknet_providers::{
jsonrpc::{HttpTransport, JsonRpcClient},
MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
Provider, ProviderError,
};
use std::assert_matches::assert_matches;
use std::collections::HashMap;
Expand All @@ -22,7 +22,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
deoxys.estimate_fee(&vec![ok_invoke_transaction], BlockId::Hash(FieldElement::ZERO)).await,
Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
Err(ProviderError::StarknetError(StarknetError::ContractNotFound))
);
}

Expand Down
10 changes: 4 additions & 6 deletions unit_tests/tests/test_estimate_message_fee.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use common::*;
use starknet_core::types::{BlockId, EthAddress, FieldElement, MsgFromL1, StarknetError};
use starknet_providers::{
jsonrpc::{HttpTransport, JsonRpcClient},
MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
Provider, ProviderError,
};
use std::assert_matches::assert_matches;
use std::collections::HashMap;
Expand Down Expand Up @@ -60,7 +60,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
.await;
assert_matches!(
deoxys_message_fee,
Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
Err(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand All @@ -85,8 +85,7 @@ async fn fail_contract_not_found(clients: HashMap<String, JsonRpcClient<HttpTran
.await;
assert_matches!(
deoxys_message_fee,
Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ContractNotFound
);
Err(ProviderError::StarknetError(StarknetError::ContractNotFound)))
}

#[rstest]
Expand All @@ -111,8 +110,7 @@ async fn fail_contract_error(clients: HashMap<String, JsonRpcClient<HttpTranspor
.await;
assert_matches!(
deoxys_message_fee,
Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ContractError
);
Err(ProviderError::StarknetError(StarknetError::ContractError(_))))
}

#[rstest]
Expand Down
7 changes: 2 additions & 5 deletions unit_tests/tests/test_get_block_transaction_count.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
use starknet_providers::{
jsonrpc::{HttpTransport, JsonRpcClient},
MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
Provider, ProviderError,
};
use unit_tests::constants::DEOXYS;

Expand All @@ -25,10 +25,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
}))
Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand Down
7 changes: 2 additions & 5 deletions unit_tests/tests/test_get_block_with_tx_hashes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
use starknet_providers::{
jsonrpc::{HttpTransport, JsonRpcClient},
MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
Provider, ProviderError,
};
use unit_tests::constants::DEOXYS;

Expand All @@ -31,10 +31,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
}))
Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand Down
7 changes: 2 additions & 5 deletions unit_tests/tests/test_get_block_with_txs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
use starknet_providers::{
jsonrpc::{HttpTransport, JsonRpcClient},
MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
Provider, ProviderError,
};
use unit_tests::constants::DEOXYS;

Expand All @@ -25,10 +25,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
}))
Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand Down
7 changes: 3 additions & 4 deletions unit_tests/tests/test_get_class.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ use common::*;

use starknet_core::types::{BlockId, FieldElement, StarknetError};
use starknet_providers::{
jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
StarknetErrorWithMessage,
jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
};
use std::assert_matches::assert_matches;
use std::collections::HashMap;
Expand All @@ -27,7 +26,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
test_contract_class_hash,
)
.await,
Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
Err(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand All @@ -47,7 +46,7 @@ async fn fail_non_existing_class_hash(clients: HashMap<String, JsonRpcClient<Htt
unknown_contract_class_hash,
)
.await,
Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ClassHashNotFound
Err(ProviderError::StarknetError(StarknetError::ClassHashNotFound))
);
}

Expand Down
13 changes: 3 additions & 10 deletions unit_tests/tests/test_get_class_at.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ use starknet_core::types::{
contract::legacy::LegacyProgram, BlockId, BlockTag, ContractClass, FieldElement, StarknetError,
};
use starknet_providers::{
jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
StarknetErrorWithMessage,
jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
};

///
Expand All @@ -34,10 +33,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
}))
Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
);
}

Expand All @@ -59,10 +55,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT

assert_matches!(
response_deoxys,
Some(ProviderError::StarknetError(StarknetErrorWithMessage {
message: _,
code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
}))
Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
);
}

Expand Down
Loading

0 comments on commit 5b72505

Please sign in to comment.