Skip to content
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
2 changes: 1 addition & 1 deletion contracts/bridge/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ mod bridge {

let request_id = bridge
.initiate_bridge_multisig(1, 2, accounts.bob, 2, Some(50), metadata)
.unwrap();
.expect("Bridge initiation should succeed in test");

// Now sign it as a bridge operator
let accounts = test::default_accounts::<DefaultEnvironment>();
Expand Down
23 changes: 15 additions & 8 deletions contracts/compliance_registry/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1131,13 +1131,16 @@ mod compliance_registry {
large_transaction_volume: false,
source_of_funds_verified: true,
};
contract.update_aml_status(user, true, aml_factors).unwrap();
contract.update_aml_status(user, true, aml_factors)
.expect("AML status update should succeed in test");

// Update sanctions status
contract.update_sanctions_status(user, true, SanctionsList::OFAC).unwrap();
contract.update_sanctions_status(user, true, SanctionsList::OFAC)
.expect("Sanctions status update should succeed in test");

// Update consent (required for compliance)
contract.update_consent(user, ConsentStatus::Given).unwrap();
contract.update_consent(user, ConsentStatus::Given)
.expect("Consent update should succeed in test");

// Check compliance
assert!(contract.is_compliant(user));
Expand Down Expand Up @@ -1170,7 +1173,7 @@ mod compliance_registry {
DocumentType::Passport,
BiometricMethod::None,
20,
).unwrap();
).expect("KYC verification should succeed in test");

// Update AML with passing status
let aml_factors = AMLRiskFactors {
Expand All @@ -1180,9 +1183,12 @@ mod compliance_registry {
large_transaction_volume: false,
source_of_funds_verified: true,
};
contract.update_aml_status(user, true, aml_factors).unwrap();
contract.update_sanctions_status(user, true, SanctionsList::UN).unwrap();
contract.update_consent(user, ConsentStatus::Given).unwrap();
contract.update_aml_status(user, true, aml_factors)
.expect("AML status update should succeed in test");
contract.update_sanctions_status(user, true, SanctionsList::UN)
.expect("Sanctions status update should succeed in test");
contract.update_consent(user, ConsentStatus::Given)
.expect("Consent update should succeed in test");

// User is compliant
assert!(contract.is_compliant(user));
Expand All @@ -1195,7 +1201,8 @@ mod compliance_registry {
large_transaction_volume: true,
source_of_funds_verified: false,
};
contract.update_aml_status(user, false, high_risk_factors).unwrap();
contract.update_aml_status(user, false, high_risk_factors)
.expect("AML status update should succeed in test");

// User is no longer compliant
assert!(!contract.is_compliant(user));
Expand Down
82 changes: 50 additions & 32 deletions contracts/escrow/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@ pub mod escrow_tests {
);

assert!(result.is_ok());
let escrow_id = result.unwrap();
let escrow_id = result.expect("Escrow creation should succeed in test");
assert_eq!(escrow_id, 1);

let escrow = contract.get_escrow(escrow_id).unwrap();
let escrow = contract
.get_escrow(escrow_id)
.expect("Escrow should exist after creation");
assert_eq!(escrow.property_id, 1);
assert_eq!(escrow.amount, 1_000_000);
assert_eq!(escrow.buyer, accounts.alice);
Expand Down Expand Up @@ -93,14 +95,16 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

// Deposit funds
ink::env::test::set_value_transferred::<ink::env::DefaultEnvironment>(1_000_000);
let result = contract.deposit_funds(escrow_id);
assert!(result.is_ok());

let escrow = contract.get_escrow(escrow_id).unwrap();
let escrow = contract
.get_escrow(escrow_id)
.expect("Escrow should exist after deposit");
assert_eq!(escrow.deposited_amount, 1_000_000);
assert_eq!(escrow.status, EscrowStatus::Active);
}
Expand All @@ -123,7 +127,7 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

let doc_hash = Hash::from([1u8; 32]);
let result = contract.upload_document(escrow_id, doc_hash, "Title Deed".to_string());
Expand Down Expand Up @@ -155,12 +159,12 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

let doc_hash = Hash::from([1u8; 32]);
contract
.upload_document(escrow_id, doc_hash, "Title Deed".to_string())
.unwrap();
.expect("Document upload should succeed in test");

// Verify document
let result = contract.verify_document(escrow_id, doc_hash);
Expand Down Expand Up @@ -188,12 +192,12 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

let result = contract.add_condition(escrow_id, "Property inspection completed".to_string());

assert!(result.is_ok());
let condition_id = result.unwrap();
let condition_id = result.expect("Condition addition should succeed in test");
assert_eq!(condition_id, 1);

let conditions = contract.get_conditions(escrow_id);
Expand All @@ -220,11 +224,11 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

let condition_id = contract
.add_condition(escrow_id, "Property inspection completed".to_string())
.unwrap();
.expect("Condition addition should succeed in test");

let result = contract.mark_condition_met(escrow_id, condition_id);
assert!(result.is_ok());
Expand Down Expand Up @@ -252,7 +256,7 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

// Alice signs
let result = contract.sign_approval(escrow_id, ApprovalType::Release);
Expand Down Expand Up @@ -288,11 +292,11 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

contract
.sign_approval(escrow_id, ApprovalType::Release)
.unwrap();
.expect("Approval signing should succeed in test");

// Try to sign again
let result = contract.sign_approval(escrow_id, ApprovalType::Release);
Expand All @@ -317,19 +321,23 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

let result =
contract.raise_dispute(escrow_id, "Property condition not as described".to_string());

assert!(result.is_ok());

let dispute = contract.get_dispute(escrow_id).unwrap();
let dispute = contract
.get_dispute(escrow_id)
.expect("Dispute should exist after raising");
assert_eq!(dispute.raised_by, accounts.alice);
assert_eq!(dispute.reason, "Property condition not as described");
assert!(!dispute.resolved);

let escrow = contract.get_escrow(escrow_id).unwrap();
let escrow = contract
.get_escrow(escrow_id)
.expect("Escrow should exist in test");
assert_eq!(escrow.status, EscrowStatus::Disputed);
}

Expand All @@ -356,22 +364,26 @@ pub mod escrow_tests {

contract
.raise_dispute(escrow_id, "Issue".to_string())
.unwrap();
.expect("Dispute raising should succeed in test");

// Admin resolves dispute
set_caller(admin);
let result = contract.resolve_dispute(escrow_id, "Resolved in favor of buyer".to_string());

assert!(result.is_ok());

let dispute = contract.get_dispute(escrow_id).unwrap();
let dispute = contract
.get_dispute(escrow_id)
.expect("Dispute should exist after raising");
assert!(dispute.resolved);
assert_eq!(
dispute.resolution,
Some("Resolved in favor of buyer".to_string())
);

let escrow = contract.get_escrow(escrow_id).unwrap();
let escrow = contract
.get_escrow(escrow_id)
.expect("Escrow should exist in test");
assert_eq!(escrow.status, EscrowStatus::Active);
}

Expand All @@ -393,11 +405,11 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

contract
.raise_dispute(escrow_id, "Issue".to_string())
.unwrap();
.expect("Dispute raising should succeed in test");

// Non-admin tries to resolve
set_caller(accounts.bob);
Expand All @@ -423,7 +435,7 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

// No conditions - should return true
let result = contract.check_all_conditions_met(escrow_id);
Expand All @@ -432,22 +444,26 @@ pub mod escrow_tests {
// Add conditions
let cond1 = contract
.add_condition(escrow_id, "Condition 1".to_string())
.unwrap();
.expect("Condition addition should succeed in test");
let cond2 = contract
.add_condition(escrow_id, "Condition 2".to_string())
.unwrap();
.expect("Condition addition should succeed in test");

// Not all met
let result = contract.check_all_conditions_met(escrow_id);
assert_eq!(result, Ok(false));

// Mark first condition met
contract.mark_condition_met(escrow_id, cond1).unwrap();
contract
.mark_condition_met(escrow_id, cond1)
.expect("Marking condition met should succeed in test");
let result = contract.check_all_conditions_met(escrow_id);
assert_eq!(result, Ok(false));

// Mark second condition met
contract.mark_condition_met(escrow_id, cond2).unwrap();
contract
.mark_condition_met(escrow_id, cond2)
.expect("Marking condition met should succeed in test");
let result = contract.check_all_conditions_met(escrow_id);
assert_eq!(result, Ok(true));
}
Expand All @@ -470,16 +486,16 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

// Perform some actions
contract
.add_condition(escrow_id, "Test condition".to_string())
.unwrap();
.expect("Condition addition should succeed in test");
let doc_hash = Hash::from([1u8; 32]);
contract
.upload_document(escrow_id, doc_hash, "Test doc".to_string())
.unwrap();
.expect("Document upload should succeed in test");

// Check audit trail
let audit_trail = contract.get_audit_trail(escrow_id);
Expand Down Expand Up @@ -539,9 +555,11 @@ pub mod escrow_tests {
2,
None,
)
.unwrap();
.expect("Escrow creation should succeed in test");

let config = contract.get_multi_sig_config(escrow_id).unwrap();
let config = contract
.get_multi_sig_config(escrow_id)
.expect("Multi-sig config should exist in test");
assert_eq!(config.required_signatures, 2);
assert_eq!(config.signers, participants);
}
Expand Down
Loading
Loading