Skip to content

Commit

Permalink
Fix clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
Sliman4 committed Dec 14, 2024
1 parent 0c28ef5 commit 0bbfca9
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 43 deletions.
44 changes: 22 additions & 22 deletions crates/oracle-contract/tests/tests/deposits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ async fn near_deposits() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let consumer_account = sandbox.dev_create_account().await?;
let initial_balance = consumer_account.view_account().await?.balance;
Expand Down Expand Up @@ -140,7 +140,7 @@ async fn near_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let consumer_account = sandbox.dev_create_account().await?;
let producer_account = sandbox.dev_create_account().await?;
Expand Down Expand Up @@ -236,9 +236,9 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;
let token = sandbox
.dev_deploy(&crate::get_ft_contract_wasm().await)
.dev_deploy(crate::get_ft_contract_wasm().await)
.await?;

let consumer_account = sandbox.dev_create_account().await?;
Expand All @@ -253,7 +253,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": contract.id(),
}))
Expand All @@ -263,7 +263,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -273,7 +273,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "mint")
.call(token.id(), "mint")
.args_json(json!({
"account_id": consumer_account.id(),
"amount": "1000000000000000000000000000",
Expand All @@ -283,7 +283,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -303,7 +303,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert_eq!(outcome.json::<String>().unwrap(), "0");

let outcome = consumer_account
.call(&token.id(), "ft_transfer_call")
.call(token.id(), "ft_transfer_call")
.args_json(json!({
"receiver_id": contract.id(),
"amount": "1000000000000000000000000",
Expand All @@ -316,7 +316,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -327,7 +327,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
);

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": contract.id(),
}))
Expand Down Expand Up @@ -361,7 +361,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -372,7 +372,7 @@ async fn ft_deposits() -> Result<(), Box<dyn std::error::Error>> {
);

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": contract.id(),
}))
Expand Down Expand Up @@ -402,9 +402,9 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;
let token = sandbox
.dev_deploy(&crate::get_ft_contract_wasm().await)
.dev_deploy(crate::get_ft_contract_wasm().await)
.await?;

let consumer_account = sandbox.dev_create_account().await?;
Expand All @@ -420,7 +420,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": contract.id(),
}))
Expand All @@ -430,7 +430,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -440,7 +440,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "mint")
.call(token.id(), "mint")
.args_json(json!({
"account_id": consumer_account.id(),
"amount": "1000000000000000000000000000",
Expand All @@ -450,7 +450,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand Down Expand Up @@ -480,7 +480,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
assert_eq!(outcome.json::<String>().unwrap(), "0");

let outcome = consumer_account
.call(&token.id(), "ft_transfer_call")
.call(token.id(), "ft_transfer_call")
.max_gas()
.args_json(json!({
"receiver_id": contract.id(),
Expand All @@ -493,7 +493,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -504,7 +504,7 @@ async fn ft_deposit_for_producer() -> Result<(), Box<dyn std::error::Error>> {
);

let outcome = consumer_account
.view(&token.id(), "ft_balance_of")
.view(token.id(), "ft_balance_of")
.args_json(json!({
"account_id": contract.id(),
}))
Expand Down
34 changes: 17 additions & 17 deletions crates/oracle-contract/tests/tests/fees.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ async fn no_fee() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;

Expand Down Expand Up @@ -152,7 +152,7 @@ async fn near_fee() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let producer_initial_balance = producer_account.view_account().await?.balance;
Expand Down Expand Up @@ -314,7 +314,7 @@ async fn near_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let producer_initial_balance = producer_account.view_account().await?.balance;
Expand Down Expand Up @@ -477,7 +477,7 @@ async fn near_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
async fn direct_near_fee() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox_with_version("2.4.0").await?;
let contract_wasm = crate::get_contract_wasm().await;
let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let producer_initial_balance = producer_account.view_account().await?.balance;
Expand Down Expand Up @@ -572,10 +572,10 @@ async fn ft_fee() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let token_wasm = crate::get_ft_contract_wasm().await;
let token = sandbox.dev_deploy(&token_wasm).await?;
let token = sandbox.dev_deploy(token_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let producer_initial_balance = producer_account
Expand Down Expand Up @@ -655,7 +655,7 @@ async fn ft_fee() -> Result<(), Box<dyn std::error::Error>> {
);

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -665,7 +665,7 @@ async fn ft_fee() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": producer_account.id(),
}))
Expand All @@ -675,7 +675,7 @@ async fn ft_fee() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": contract.id(),
}))
Expand All @@ -685,7 +685,7 @@ async fn ft_fee() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "mint")
.call(token.id(), "mint")
.args_json(json!({
"account_id": consumer_account.id(),
"amount": "1000000000000000000000000000",
Expand Down Expand Up @@ -788,7 +788,7 @@ async fn ft_fee() -> Result<(), Box<dyn std::error::Error>> {
producer_new_balance
.checked_sub(producer_initial_balance)
.unwrap(),
(10u128.pow(24) / 10).into()
(10u128.pow(24) / 10)
);

Ok(())
Expand All @@ -799,10 +799,10 @@ async fn ft_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let token_wasm = crate::get_ft_contract_wasm().await;
let token = sandbox.dev_deploy(&token_wasm).await?;
let token = sandbox.dev_deploy(token_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let producer_initial_balance = producer_account
Expand Down Expand Up @@ -848,7 +848,7 @@ async fn ft_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": consumer_account.id(),
}))
Expand All @@ -858,7 +858,7 @@ async fn ft_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": producer_account.id(),
}))
Expand All @@ -868,7 +868,7 @@ async fn ft_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "storage_deposit")
.call(token.id(), "storage_deposit")
.args_json(json!({
"account_id": contract.id(),
}))
Expand All @@ -878,7 +878,7 @@ async fn ft_fee_refund() -> Result<(), Box<dyn std::error::Error>> {
assert!(outcome.is_success());

let outcome = consumer_account
.call(&token.id(), "mint")
.call(token.id(), "mint")
.args_json(json!({
"account_id": consumer_account.id(),
"amount": "1000000000000000000000000000",
Expand Down
4 changes: 2 additions & 2 deletions crates/oracle-contract/tests/tests/register.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ async fn register_consumer() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let consumer_account = sandbox.dev_create_account().await?;

Expand Down Expand Up @@ -43,7 +43,7 @@ async fn register_producer() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;

Expand Down
2 changes: 1 addition & 1 deletion crates/oracle-contract/tests/tests/request_response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ async fn contract_is_operational() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let consumer_account = sandbox.dev_create_account().await?;
Expand Down
2 changes: 1 addition & 1 deletion crates/oracle-contract/tests/tests/two_responses.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async fn cannot_send_two_responses() -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract_wasm = crate::get_contract_wasm().await;

let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let producer_account = sandbox.dev_create_account().await?;
let consumer_account = sandbox.dev_create_account().await?;
Expand Down

0 comments on commit 0bbfca9

Please sign in to comment.