fix: rebase fixes

Author: VladasZ

contract/src/claim/api.rs

@@ -9,12 +9,8 @@ use sweat_jar_model::{
 };
 
 use crate::{
-    common::{
-        gas_data::{GAS_FOR_AFTER_CLAIM, GAS_FOR_FT_TRANSFER},
-        Timestamp,
-    },
+    common::Timestamp,
     event::{emit, ClaimEventItem, EventKind},
-    internal::assert_gas,
     jar::model::Jar,
     Contract, ContractExt, JarsStorage,
 };
@@ -142,7 +138,11 @@ impl Contract {
         event: EventKind,
         now: Timestamp,
     ) -> PromiseOrValue<ClaimedAmountView> {
-        use crate::ft_interface::FungibleTokenInterface;
+        use crate::{
+            common::gas_data::{GAS_FOR_AFTER_CLAIM, GAS_FOR_FT_TRANSFER},
+            ft_interface::FungibleTokenInterface,
+            internal::assert_gas,
+        };
 
         assert_gas(GAS_FOR_FT_TRANSFER.as_gas() * 2 + GAS_FOR_AFTER_CLAIM.as_gas(), || {
             format!("claim_interest: number of jars: {}", jars_before_transfer.len())

contract/src/tests.rs

@@ -380,9 +380,9 @@ fn unlock_not_by_manager() {
     let alice = alice();
     let admin = admin();
 
-    let reference_product = generate_product();
+    let reference_product = Product::new();
 
-    let mut reference_jar = Jar::generate(0, &alice, &reference_product.id).principal(100);
+    let mut reference_jar = Jar::new(0).product_id(&reference_product.id).principal(100);
     reference_jar.is_pending_withdraw = true;
     let jars = &[reference_jar];
 
@@ -397,10 +397,10 @@ fn unlock_by_manager() {
     let alice = alice();
     let admin = admin();
 
-    let reference_product = generate_product();
+    let reference_product = Product::new();
 
     let reference_jar_id = 0;
-    let mut reference_jar = Jar::generate(reference_jar_id, &alice, &reference_product.id).principal(100);
+    let mut reference_jar = Jar::new(0).product_id(&reference_product.id).principal(100);
     reference_jar.is_pending_withdraw = true;
     let jars = &[reference_jar];
 

model/src/jar.rs

@@ -21,6 +21,7 @@ pub struct JarView {
     pub principal: U128,
     pub claimed_balance: U128,
     pub is_penalty_applied: bool,
+    #[serde(default)]
     pub is_pending_withdraw: bool,
 }