Skip to content

Commit

Permalink
fix: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@veeso
veeso committed Feb 12, 2024
1 parent 8589f30 commit d726139
Show file tree
Hide file tree
Showing 15 changed files with 82 additions and 98 deletions.
6 changes: 3 additions & 3 deletions src/deferred/src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ mod test {
init_canister();
store_mock_contract(&[1, 2], 1);

let token_info = Deferred::get_token(&2__u64.into()).unwrap();
let token_info = Deferred::get_token(&2_u64.into()).unwrap();
assert_eq!(token_info.token.id, Nat::from(2_u64));
assert_eq!(token_info.contract.id, Nat::from(1_u64));
}
Expand All @@ -560,7 +560,7 @@ mod test {
init_canister();
store_mock_contract(&[1, 2], 1);
assert_eq!(
Deferred::get_contract(&1__u64.into()).unwrap().id,
Deferred::get_contract(&1_u64.into()).unwrap().id,
Nat::from(1_u64)
);
}
Expand Down Expand Up @@ -647,7 +647,7 @@ mod test {
)
.is_ok());
assert_eq!(
Deferred::get_contract(&1__u64.into()).unwrap().buyers,
Deferred::get_contract(&1_u64.into()).unwrap().buyers,
vec![Principal::management_canister(), caller()]
);
}
Expand Down
70 changes: 29 additions & 41 deletions src/deferred/src/app/inspect.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ mod test {
token.operator = None;
},
);
assert!(Inspect::inspect_is_owner_or_operator(caller, &1__u64.into()).is_ok());
assert!(Inspect::inspect_is_owner_or_operator(caller, &1_u64.into()).is_ok());

// with operator
test_utils::store_mock_contract_with(
Expand All @@ -242,10 +242,8 @@ mod test {
token.operator = Some(caller);
},
);
assert!(
ContractStorage::transfer(&2__u64.into(), Principal::management_canister()).is_ok()
);
assert!(Inspect::inspect_is_owner_or_operator(caller, &2__u64.into()).is_ok());
assert!(ContractStorage::transfer(&2_u64.into(), Principal::management_canister()).is_ok());
assert!(Inspect::inspect_is_owner_or_operator(caller, &2_u64.into()).is_ok());

// no operator, no owner
test_utils::store_mock_contract_with(
Expand All @@ -256,10 +254,8 @@ mod test {
token.operator = Some(Principal::management_canister());
},
);
assert!(
ContractStorage::transfer(&3__u64.into(), Principal::management_canister()).is_ok()
);
assert!(Inspect::inspect_is_owner_or_operator(caller, &3__u64.into()).is_err());
assert!(ContractStorage::transfer(&3_u64.into(), Principal::management_canister()).is_ok());
assert!(Inspect::inspect_is_owner_or_operator(caller, &3_u64.into()).is_err());
}

#[test]
Expand All @@ -274,7 +270,7 @@ mod test {
token.operator = None;
},
);
assert!(Inspect::inspect_transfer_from(caller, &1__u64.into()).is_ok());
assert!(Inspect::inspect_transfer_from(caller, &1_u64.into()).is_ok());

// with operator
test_utils::store_mock_contract_with(
Expand All @@ -285,10 +281,8 @@ mod test {
token.operator = Some(caller);
},
);
assert!(
ContractStorage::transfer(&2__u64.into(), Principal::management_canister()).is_ok()
);
assert!(Inspect::inspect_transfer_from(caller, &2__u64.into()).is_ok());
assert!(ContractStorage::transfer(&2_u64.into(), Principal::management_canister()).is_ok());
assert!(Inspect::inspect_transfer_from(caller, &2_u64.into()).is_ok());

// no operator, no owner
test_utils::store_mock_contract_with(
Expand All @@ -299,10 +293,8 @@ mod test {
token.operator = Some(Principal::management_canister());
},
);
assert!(
ContractStorage::transfer(&3__u64.into(), Principal::management_canister()).is_ok()
);
assert!(Inspect::inspect_transfer_from(caller, &3__u64.into()).is_err());
assert!(ContractStorage::transfer(&3_u64.into(), Principal::management_canister()).is_ok());
assert!(Inspect::inspect_transfer_from(caller, &3_u64.into()).is_err());

test_utils::store_mock_contract_with(
&[4],
Expand All @@ -313,8 +305,8 @@ mod test {
token.operator = None;
},
);
assert!(ContractStorage::burn_token(&4__u64.into()).is_ok());
assert!(Inspect::inspect_transfer_from(caller, &4__u64.into()).is_err());
assert!(ContractStorage::burn_token(&4_u64.into()).is_ok());
assert!(Inspect::inspect_transfer_from(caller, &4_u64.into()).is_err());
}

#[test]
Expand All @@ -332,7 +324,7 @@ mod test {
token.operator = None;
},
);
assert!(Inspect::inspect_burn(caller, &1__u64.into()).is_ok());
assert!(Inspect::inspect_burn(caller, &1_u64.into()).is_ok());
// caller is operator and token is owned by buyer
test_utils::store_mock_contract_with(
&[2],
Expand All @@ -344,10 +336,8 @@ mod test {
token.operator = Some(caller);
},
);
assert!(
ContractStorage::transfer(&2__u64.into(), Principal::management_canister()).is_ok()
);
assert!(Inspect::inspect_burn(caller, &2__u64.into()).is_ok());
assert!(ContractStorage::transfer(&2_u64.into(), Principal::management_canister()).is_ok());
assert!(Inspect::inspect_burn(caller, &2_u64.into()).is_ok());
// caller is owner and token is owned by buyer
test_utils::store_mock_contract_with(
&[3],
Expand All @@ -364,8 +354,8 @@ mod test {
token.operator = None;
},
);
assert!(ContractStorage::transfer(&2__u64.into(), caller).is_ok());
assert!(Inspect::inspect_burn(caller, &1__u64.into()).is_ok());
assert!(ContractStorage::transfer(&2_u64.into(), caller).is_ok());
assert!(Inspect::inspect_burn(caller, &1_u64.into()).is_ok());
// caller is operator and token is owned by buyer
test_utils::store_mock_contract_with(
&[4],
Expand All @@ -382,8 +372,8 @@ mod test {
token.operator = Some(caller);
},
);
assert!(ContractStorage::transfer(&4__u64.into(), caller).is_ok());
assert!(Inspect::inspect_burn(caller, &4__u64.into()).is_ok());
assert!(ContractStorage::transfer(&4_u64.into(), caller).is_ok());
assert!(Inspect::inspect_burn(caller, &4_u64.into()).is_ok());
// caller is not owner nor operator
test_utils::store_mock_contract_with(
&[5],
Expand All @@ -395,10 +385,8 @@ mod test {
token.operator = None;
},
);
assert!(
ContractStorage::transfer(&5__u64.into(), Principal::management_canister()).is_ok()
);
assert!(Inspect::inspect_burn(caller, &5__u64.into()).is_err());
assert!(ContractStorage::transfer(&5_u64.into(), Principal::management_canister()).is_ok());
assert!(Inspect::inspect_burn(caller, &5_u64.into()).is_err());
// caller is owner, but owner is a third party
test_utils::store_mock_contract_with(
&[6],
Expand All @@ -415,8 +403,8 @@ mod test {
token.operator = None;
},
);
assert!(ContractStorage::transfer(&6__u64.into(), caller).is_ok());
assert!(Inspect::inspect_burn(caller, &6__u64.into()).is_err());
assert!(ContractStorage::transfer(&6_u64.into(), caller).is_ok());
assert!(Inspect::inspect_burn(caller, &6_u64.into()).is_err());
}

#[test]
Expand Down Expand Up @@ -565,7 +553,7 @@ mod test {
let tokens = vec![test_utils::mock_token(0, 0)];
assert!(Inspect::inspect_seller_increment_contract_value(caller, 0_u64.into()).is_err());
// sign contract
assert!(ContractStorage::sign_contract_and_mint_tokens(&0__u64.into(), tokens).is_ok());
assert!(ContractStorage::sign_contract_and_mint_tokens(&0_u64.into(), tokens).is_ok());
assert!(Inspect::inspect_seller_increment_contract_value(caller, 0_u64.into()).is_ok());
// not seller
assert!(Inspect::inspect_seller_increment_contract_value(
Expand All @@ -590,31 +578,31 @@ mod test {
);
assert!(Inspect::inspect_update_contract_property(
caller,
&1__u64.into(),
&1_u64.into(),
"contract:address"
)
.is_ok());
assert!(
Inspect::inspect_update_contract_property(caller, &1__u64.into(), "foobar").is_err()
Inspect::inspect_update_contract_property(caller, &1_u64.into(), "foobar").is_err()
);
assert!(Inspect::inspect_update_contract_property(
Principal::management_canister(),
&1__u64.into(),
&1_u64.into(),
"contract:address"
)
.is_err());
// unexisting contract
assert!(Inspect::inspect_update_contract_property(
caller,
&2__u64.into(),
&2_u64.into(),
"contract:address"
)
.is_err());
// admin
assert!(RolesManager::set_custodians(vec![Principal::management_canister()]).is_ok());
assert!(Inspect::inspect_update_contract_property(
Principal::management_canister(),
&1__u64.into(),
&1_u64.into(),
"contract:address"
)
.is_ok());
Expand Down
20 changes: 8 additions & 12 deletions src/deferred/src/app/storage/contracts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ mod test {

assert!(ContractStorage::insert_contract(contract).is_ok());
assert!(ContractStorage::sign_contract_and_mint_tokens(
&1__u64.into(),
&1_u64.into(),
vec![token_1, token_2]
)
.is_err());
Expand Down Expand Up @@ -879,9 +879,7 @@ mod test {
let token = mock_token(1, 1);
let contract_1 = mock_contract(1, 1);
assert!(ContractStorage::insert_contract(contract_1).is_ok());
assert!(
ContractStorage::sign_contract_and_mint_tokens(&1__u64.into(), vec![token]).is_ok()
);
assert!(ContractStorage::sign_contract_and_mint_tokens(&1_u64.into(), vec![token]).is_ok());

let contract_2 = mock_contract(2, 1);
assert!(ContractStorage::insert_contract(contract_2).is_ok());
Expand All @@ -904,11 +902,9 @@ mod test {
));
});
assert!(ContractStorage::insert_contract(contract).is_ok());
assert!(
ContractStorage::sign_contract_and_mint_tokens(&1__u64.into(), vec![token]).is_ok()
);
assert!(ContractStorage::sign_contract_and_mint_tokens(&1_u64.into(), vec![token]).is_ok());

let metadata = ContractStorage::get_token_metadata(&1__u64.into()).unwrap();
let metadata = ContractStorage::get_token_metadata(&1_u64.into()).unwrap();
assert_eq!(metadata.token_identifier, 1_u64);
assert_eq!(metadata.approved_at, None);
assert_eq!(metadata.approved_by, None);
Expand Down Expand Up @@ -936,13 +932,13 @@ mod test {
assert!(ContractStorage::insert_contract(contract).is_ok());

assert!(ContractStorage::update_contract_property(
&1__u64.into(),
&1_u64.into(),
"contract:address".to_string(),
dip721::GenericValue::TextContent("Milan".to_string())
)
.is_ok());
assert_eq!(
ContractStorage::get_contract(&1__u64.into())
ContractStorage::get_contract(&1_u64.into())
.unwrap()
.properties
.iter()
Expand All @@ -953,13 +949,13 @@ mod test {
);

assert!(ContractStorage::update_contract_property(
&1__u64.into(),
&1_u64.into(),
"contract:addressLong".to_string(),
dip721::GenericValue::TextContent("Trieste".to_string())
)
.is_ok());
assert_eq!(
ContractStorage::get_contract(&1__u64.into())
ContractStorage::get_contract(&1_u64.into())
.unwrap()
.properties
.iter()
Expand Down
2 changes: 1 addition & 1 deletion src/deferred/src/app/storage/tx_history.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ mod test {
fn test_should_insert_transactions() {
let token = mock_token(1, 1);
TxHistory::register_token_mint(&token);
let tx = TxHistory::get_transaction_by_id(0__u64.into()).unwrap();
let tx = TxHistory::get_transaction_by_id(0_u64.into()).unwrap();
assert_eq!(tx.operation, "mint");
assert_eq!(tx.caller, crate::utils::caller());
assert_eq!(tx.details.len(), 4);
Expand Down
2 changes: 1 addition & 1 deletion src/deferred/src/app/test_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn mock_token(id: u64, contract_id: u64) -> Token {
transferred_by: None,
approved_at: None,
approved_by: None,
picoekoke_reward: 4000__u64.into(),
picoekoke_reward: 4000_u64.into(),
burned_at: None,
burned_by: None,
minted_at: 0,
Expand Down
2 changes: 1 addition & 1 deletion src/deferred/src/client/ekoke_client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ impl EkokeClient for IcEkokeClient {
_contract_id: ID,
_installments: u64,
) -> DeferredResult<PicoEkoke> {
Ok(71_000__u64.into())
Ok(71_000_u64.into())
}
}
14 changes: 7 additions & 7 deletions src/ekoke/src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ mod test {
async fn test_should_reserve_pool() {
init_canister();
let contract_id = 1_u64.into();
let picoekoke_amount: Nat = 1000__u64.into();
let picoekoke_amount: Nat = 1000_u64.into();

let result = EkokeCanister::reserve_pool(
test_utils::caller_account(),
Expand All @@ -719,7 +719,7 @@ mod test {
async fn test_should_not_allow_reserve_pool() {
init_canister();
let contract_id = 1_u64.into();
let picoekoke_amount = 1000__u64.into();
let picoekoke_amount = 1000_u64.into();

assert!(EkokeCanister::reserve_pool(
test_utils::bob_account(),
Expand All @@ -735,7 +735,7 @@ mod test {
init_canister();
let contract_id: ID = 1_u64.into();

let picoekoke_amount: Nat = 1000__u64.into();
let picoekoke_amount: Nat = 1000_u64.into();

let result = EkokeCanister::reserve_pool(
test_utils::caller_account(),
Expand All @@ -748,7 +748,7 @@ mod test {

// send reward to bob
assert!(
EkokeCanister::send_reward(contract_id, 500__u64.into(), bob_account())
EkokeCanister::send_reward(contract_id, 500_u64.into(), bob_account())
.await
.is_ok()
);
Expand All @@ -763,7 +763,7 @@ mod test {
init_canister();
let contract_id: ID = 1_u64.into();

let picoekoke_amount: Nat = 1000__u64.into();
let picoekoke_amount: Nat = 1000_u64.into();

let result = EkokeCanister::reserve_pool(
test_utils::caller_account(),
Expand All @@ -776,12 +776,12 @@ mod test {

// send reward to bob
assert!(
EkokeCanister::send_reward(contract_id, 5000__u64.into(), bob_account())
EkokeCanister::send_reward(contract_id, 5000_u64.into(), bob_account())
.await
.is_err()
);
assert!(
EkokeCanister::send_reward(2_u64.into(), 500__u64.into(), bob_account())
EkokeCanister::send_reward(2_u64.into(), 500_u64.into(), bob_account())
.await
.is_err()
);
Expand Down
4 changes: 2 additions & 2 deletions src/ekoke/src/app/erc20_bridge/swap_pool.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ mod test {
#[tokio::test]
async fn test_should_deposit_and_withdraw_from_swap_pool() {
let alice = test_utils::alice_account();
Balance::init_balances(Nat::from(100_u64), vec![(alice.clone(), 100__u64.into())]);
Balance::init_balances(Nat::from(100_u64), vec![(alice.clone(), 100_u64.into())]);

// check if swap pool account is anonymous
let swap_pool_account = Configuration::get_erc20_swap_pool_account();
Expand Down Expand Up @@ -95,7 +95,7 @@ mod test {
#[tokio::test]
async fn should_not_allow_withdraw_or_deposit_with_insufficient_balance() {
let alice = test_utils::alice_account();
Balance::init_balances(Nat::from(100_u64), vec![(alice.clone(), 100__u64.into())]);
Balance::init_balances(Nat::from(100_u64), vec![(alice.clone(), 100_u64.into())]);

assert!(SwapPool::deposit(alice.clone(), Nat::from(200_u64))
.await
Expand Down
Loading

0 comments on commit d726139

Please sign in to comment.