Skip to content
Open
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
26 changes: 13 additions & 13 deletions fluxapay/src/dispute_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fn test_create_dispute() {
let deposit_address = Address::generate(&env);
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -53,7 +53,7 @@ fn test_create_dispute() {
// Verify payment
let transaction_hash = BytesN::<32>::random(&env);
let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(&oracle, &payment_id, &transaction_hash, &customer, &amount);

// Create dispute
Expand Down Expand Up @@ -92,7 +92,7 @@ fn test_review_dispute() {
let deposit_address = Address::generate(&env);
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -103,7 +103,7 @@ fn test_review_dispute() {

let transaction_hash = BytesN::<32>::random(&env);
let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(&oracle, &payment_id, &transaction_hash, &customer, &amount);

// Create dispute
Expand Down Expand Up @@ -142,7 +142,7 @@ fn test_resolve_dispute_with_refund() {
let deposit_address = Address::generate(&env);
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -153,7 +153,7 @@ fn test_resolve_dispute_with_refund() {

let transaction_hash = BytesN::<32>::random(&env);
let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(&oracle, &payment_id, &transaction_hash, &customer, &amount);

// Register payment with refund manager for amount validation
Expand Down Expand Up @@ -205,7 +205,7 @@ fn test_reject_dispute() {
let deposit_address = Address::generate(&env);
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -216,7 +216,7 @@ fn test_reject_dispute() {

let transaction_hash = BytesN::<32>::random(&env);
let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(&oracle, &payment_id, &transaction_hash, &customer, &amount);

// Create dispute
Expand Down Expand Up @@ -253,7 +253,7 @@ fn test_get_payment_disputes() {
let deposit_address = Address::generate(&env);
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -264,7 +264,7 @@ fn test_get_payment_disputes() {

let transaction_hash = BytesN::<32>::random(&env);
let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(&oracle, &payment_id, &transaction_hash, &customer, &amount);

// Create multiple disputes
Expand Down Expand Up @@ -306,7 +306,7 @@ fn test_dispute_invalid_amount() {
let deposit_address = Address::generate(&env);
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand Down Expand Up @@ -343,7 +343,7 @@ fn test_resolve_dispute_with_only_operator_auth() {

let payment_id = String::from_str(&env, "pay_auth_test");
let amount = 500i128;
payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -353,7 +353,7 @@ fn test_resolve_dispute_with_only_operator_auth() {
);

let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
let tx_hash = BytesN::<32>::random(&env);
payment_client.verify_payment(&oracle, &payment_id, &tx_hash, &customer, &amount);

Expand Down
12 changes: 6 additions & 6 deletions fluxapay/src/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fn test_happy_path_flow() {
let amount = 1000i128;
let expires_at = env.ledger().timestamp() + 3600;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -76,7 +76,7 @@ fn test_happy_path_flow() {

let tx_hash = BytesN::<32>::random(&env);
let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(&oracle, &payment_id, &tx_hash, &customer, &amount);

let payment_info = payment_client.get_payment(&payment_id);
Expand Down Expand Up @@ -122,11 +122,11 @@ fn test_settlement_path() {
let treasury = Address::generate(&env);
let operator = Address::generate(&env);

payment_client.grant_role(&admin, &Symbol::new(&env, "SETTLEMENT_OPERATOR"), &operator);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "SETTLEMENT_OPERATOR"), &operator);

let payment_id = String::from_str(&env, "PAY_SETTLE");
let amount = 2000i128;
payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand All @@ -136,7 +136,7 @@ fn test_settlement_path() {
);

let oracle = Address::generate(&env);
payment_client.grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "ORACLE"), &oracle);
payment_client.verify_payment(
&oracle,
&payment_id,
Expand Down Expand Up @@ -165,7 +165,7 @@ fn test_failure_and_expiration_path() {
let amount = 500i128;
let expires_at = env.ledger().timestamp() + 100;

payment_client.grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
payment_client.payment_grant_role(&admin, &Symbol::new(&env, "MERCHANT"), &merchant); payment_client.create_payment(
&payment_id,
&merchant,
&amount,
Expand Down
Loading