Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

batch index events #174

Merged
merged 3 commits into from
Nov 28, 2023
Merged

batch index events #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70932e1
batch index events
aie0 Nov 28, 2023
3b67300
Merge branch 'deployment-0.9.30' into payout-events
aie0 Nov 28, 2023
594d503
merge + fmt
aie0 Nov 28, 2023
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
4 changes: 4 additions & 0 deletions pallets/ddc-payouts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,14 @@ pub mod pallet {
Charged {
cluster_id: ClusterId,
era: DdcEra,
batch_index: BatchIndex,
customer_id: T::AccountId,
amount: u128,
},
ChargeFailed {
cluster_id: ClusterId,
era: DdcEra,
batch_index: BatchIndex,
customer_id: T::AccountId,
amount: u128,
},
Expand Down Expand Up @@ -396,6 +398,7 @@ pub mod pallet {
Self::deposit_event(Event::<T>::ChargeFailed {
cluster_id,
era,
batch_index,
customer_id,
amount: total_customer_charge,
});
Expand All @@ -415,6 +418,7 @@ pub mod pallet {
Self::deposit_event(Event::<T>::Charged {
cluster_id,
era,
batch_index,
customer_id,
amount: total_customer_charge,
});
Expand Down
34 changes: 27 additions & 7 deletions pallets/ddc-payouts/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ fn send_charging_customers_batch_works() {
let cluster_id = ClusterId::from([12; 20]);
let era = 100;
let max_batch_index = 3;
let batch_index = 0;
let mut batch_index = 0;
let usage1 = CustomerUsage {
// should pass without debt
transferred_bytes: 23452345,
Expand Down Expand Up @@ -360,28 +360,44 @@ fn send_charging_customers_batch_works() {
assert_eq!(charge2.transfer + charge4.transfer, report.total_customer_charge.transfer);

System::assert_has_event(
Event::ChargeFailed { cluster_id, era, customer_id: user2_debtor, amount: debt }.into(),
Event::ChargeFailed {
cluster_id,
era,
customer_id: user2_debtor,
batch_index,
amount: debt,
}
.into(),
);
System::assert_last_event(
Event::Charged { cluster_id, era, customer_id: user4, amount: usage4_charge }.into(),
Event::Charged {
cluster_id,
era,
customer_id: user4,
batch_index,
amount: usage4_charge,
}
.into(),
);

assert_eq!(System::events().len(), 5 + 3); // 3 for Currency::transfer

// batch 2
let mut before_total_customer_charge = report.total_customer_charge.clone();
batch_index += 1;
assert_ok!(DdcPayouts::send_charging_customers_batch(
RuntimeOrigin::signed(dac_account),
cluster_id,
era,
batch_index + 1,
batch_index,
payers2,
));

System::assert_last_event(
Event::Charged {
cluster_id,
era,
batch_index,
customer_id: user1,
amount: calculate_charge(usage1.clone()),
}
Expand Down Expand Up @@ -413,12 +429,13 @@ fn send_charging_customers_batch_works() {

let balance_before = Balances::free_balance(DdcPayouts::sub_account_id(cluster_id, era));
// batch 3
batch_index += 2;
before_total_customer_charge = report.total_customer_charge.clone();
assert_ok!(DdcPayouts::send_charging_customers_batch(
RuntimeOrigin::signed(dac_account),
cluster_id,
era,
batch_index + 2,
batch_index,
payers3,
));

Expand Down Expand Up @@ -454,6 +471,7 @@ fn send_charging_customers_batch_works() {
Event::ChargeFailed {
cluster_id,
era,
batch_index,
customer_id: user3_debtor,
amount: user3_charge,
}
Expand Down Expand Up @@ -578,7 +596,8 @@ fn end_charging_customers_works() {
let report_before = DdcPayouts::active_billing_reports(cluster_id, era).unwrap();
let charge = calculate_charge(usage1);
System::assert_last_event(
Event::Charged { cluster_id, era, customer_id: user1, amount: charge }.into(),
Event::Charged { cluster_id, era, batch_index, customer_id: user1, amount: charge }
.into(),
);

let mut balance = Balances::free_balance(DdcPayouts::sub_account_id(cluster_id, era));
Expand Down Expand Up @@ -699,7 +718,8 @@ fn end_charging_customers_works_zero_fees() {
let report_before = DdcPayouts::active_billing_reports(cluster_id, era).unwrap();
let charge = calculate_charge(usage1);
System::assert_last_event(
Event::Charged { cluster_id, era, customer_id: user1, amount: charge }.into(),
Event::Charged { cluster_id, era, customer_id: user1, batch_index, amount: charge }
.into(),
);

let mut balance = Balances::free_balance(DdcPayouts::sub_account_id(cluster_id, era));
Expand Down