Add products generating and context preparing (#9)

Author: vasyafromrussia

contract/src/claim/mod.rs

@@ -2,43 +2,28 @@ pub mod api;
 
 #[cfg(test)]
 mod tests {
-    use near_sdk::{
-        json_types::{U128, U64},
-        test_utils::accounts,
-        PromiseOrValue,
-    };
+    use near_sdk::{json_types::U128, test_utils::accounts, PromiseOrValue};
 
     use crate::{
         claim::api::ClaimApi,
-        common::{tests::Context, U32},
-        jar::{api::JarApi, model::JarTicket},
-        product::{api::ProductApi, tests::get_register_product_command},
+        common::{tests::Context, UDecimal, U32},
+        jar::{api::JarApi, model::Jar},
+        product::{
+            model::{Apy, Product},
+            tests::YEAR_IN_MS,
+        },
     };
 
     #[test]
     fn claim_total_when_nothing_to_claim() {
         let alice = accounts(0);
         let admin = accounts(1);
 
-        let mut context = Context::new(admin.clone());
-
-        context.switch_account(&admin);
-        context.with_deposit_yocto(1, |context| {
-            context.contract.register_product(get_register_product_command())
-        });
+        let product = generate_product();
+        let jar = Jar::generate(0, &alice, &product.id).principal(100_000_000);
+        let mut context = Context::new(admin).with_products(&[product]).with_jars(&[jar]);
 
-        context.switch_account_to_owner();
-        context.contract.create_jar(
-            alice.clone(),
-            JarTicket {
-                product_id: get_register_product_command().id,
-                valid_until: U64(0),
-            },
-            U128(100_000_000),
-            None,
-        );
-
-        context.switch_account(&alice.clone());
+        context.switch_account(&alice);
         let result = context.contract.claim_total();
 
         if let PromiseOrValue::Value(value) = result {
@@ -53,30 +38,25 @@ mod tests {
         let alice = accounts(0);
         let admin = accounts(1);
 
-        let mut context = Context::new(admin.clone());
-
-        context.switch_account(&admin);
-        context.with_deposit_yocto(1, |context| {
-            context.contract.register_product(get_register_product_command())
-        });
-
-        context.switch_account_to_owner();
-        context.contract.create_jar(
-            alice.clone(),
-            JarTicket {
-                product_id: get_register_product_command().id,
-                valid_until: U64(0),
-            },
-            U128(100_000_000_000),
-            None,
-        );
+        let product = generate_product();
+        let reference_jar = Jar::generate(0, &alice, &product.id).principal(100_000_000_000);
+        let mut context = Context::new(admin)
+            .with_products(&[product])
+            .with_jars(&[reference_jar.clone()]);
 
         context.set_block_timestamp_in_days(365);
 
-        context.switch_account(&alice.clone());
-        context.contract.claim_jars(vec![0], Some(U128(100)));
+        context.switch_account(&alice);
+        context.contract.claim_jars(vec![reference_jar.index], Some(U128(100)));
 
-        let jar = context.contract.get_jar(U32(0));
+        let jar = context.contract.get_jar(U32(reference_jar.index));
         assert_eq!(100, jar.claimed_balance.0);
     }
+
+    fn generate_product() -> Product {
+        Product::generate("product")
+            .enabled(true)
+            .lockup_term(YEAR_IN_MS)
+            .apy(Apy::Constant(UDecimal::new(12, 2)))
+    }
 }

contract/src/common.rs

@@ -189,10 +189,6 @@ pub(crate) mod tests {
             testing_env!(self.builder.build());
         }
 
-        pub(crate) fn switch_account_to_owner(&mut self) {
-            self.switch_account(&self.owner.clone());
-        }
-
         pub(crate) fn switch_account_to_ft_contract_account(&mut self) {
             self.switch_account(&self.ft_contract_id.clone());
         }

contract/src/ft_receiver.rs

@@ -113,7 +113,7 @@ mod tests {
 
         let ticket_amount = 1_000_000u128;
         let ticket_valid_until = 100_000_000u64;
-        let signature = signer.sign(
+        let signature = signer.sign_base64(
             Contract::get_signature_material(
                 &context.owner,
                 &alice,