review fixes

sweatco · Jan 25, 2024 · 1d26d97 · 1d26d97
1 parent 7b20ef4
commit 1d26d97
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/integration-tests/src/defer.rs b/integration-tests/src/defer.rs
@@ -26,7 +26,7 @@ async fn test_defer() -> anyhow::Result<()> {
 
     let (total_fee, total_for_user) = context
         .ft_contract()
-        .calculate_fee_for_batch(BATCH_SIZE, CLAIM_AMOUNT)
+        .calculate_payout_with_fee_for_batch(BATCH_SIZE, CLAIM_AMOUNT)
         .call()
         .await?;
 

diff --git a/model/src/lib.rs b/model/src/lib.rs
@@ -84,5 +84,5 @@ pub trait StorageManagement {
 
 #[make_integration_version]
 pub trait IntegrationTestMethods {
-    fn calculate_fee_for_batch(&self, batch_size: u32, claim_amount: u32) -> (U128, U128);
+    fn calculate_payout_with_fee_for_batch(&self, batch_size: u32, claim_amount: u32) -> (U128, U128);
 }
diff --git a/res/sweat.wasm b/res/sweat.wasm
diff --git a/sweat-integration/src/lib.rs b/sweat-integration/src/lib.rs
@@ -187,8 +187,8 @@ impl SweatApiIntegration for SweatFt<'_> {
 }
 
 impl IntegrationTestMethodsIntegration for SweatFt<'_> {
-    fn calculate_fee_for_batch(&self, batch_size: u32, claim_amount: u32) -> ContractCall<(U128, U128)> {
-        self.make_call("calculate_fee_for_batch")
+    fn calculate_payout_with_fee_for_batch(&self, batch_size: u32, claim_amount: u32) -> ContractCall<(U128, U128)> {
+        self.make_call("calculate_payout_with_fee_for_batch")
             .args_json(json!({
                 "batch_size": batch_size,
                 "claim_amount": claim_amount,

diff --git a/sweat/src/defer.rs b/sweat/src/defer.rs
@@ -1,11 +1,6 @@
 use near_contract_standards::fungible_token::events::FtMint;
 use near_sdk::{
-    env,
-    env::{log_str, panic_str},
-    ext_contract, is_promise_success,
-    json_types::U128,
-    near_bindgen, require,
-    serde_json::json,
+    env, env::panic_str, ext_contract, is_promise_success, json_types::U128, near_bindgen, require, serde_json::json,
     AccountId, Gas, Promise, PromiseOrValue,
 };
 use sweat_model::SweatDefer;
@@ -44,9 +39,6 @@ impl SweatDefer for Contract {
         // These values calculated in `measure_record_batch_for_hold_test` in claim contract.
         let record_batch_for_hold_gas = Gas::ONE_TERA * 8 + Gas(batch_len * ONE_GGAS * 320);
 
-        log_str("holding_account_id");
-        log_str(holding_account_id.as_str());
-
         Promise::new(holding_account_id.clone())
             .function_call(
                 "record_batch_for_hold".to_string(),

diff --git a/sweat/src/integration.rs b/sweat/src/integration.rs
@@ -10,7 +10,7 @@ use crate::{Contract, ContractExt};
 
 #[near_bindgen]
 impl IntegrationTestMethods for Contract {
-    fn calculate_fee_for_batch(&self, batch_size: u32, claim_amount: u32) -> (U128, U128) {
+    fn calculate_payout_with_fee_for_batch(&self, batch_size: u32, claim_amount: u32) -> (U128, U128) {
         let mut total_fee = 0;
         let mut total_for_user = 0;