refactor: merged jars

contract/Cargo.toml

@@ -17,7 +17,6 @@ integration-test = [
 integration-api = ["sweat-jar-model/integration-api"]
 
 [dependencies]
-ed25519-dalek = { workspace = true }
 mutants = { workspace = true }
 
 near-sdk = { workspace = true, features = ["unit-testing"] }
@@ -29,9 +28,6 @@ sweat-jar-model = { workspace = true }
 [dev-dependencies]
 visu = { workspace = true }
 fake = { workspace = true }
-rand = { workspace = true }
-sha256 = { workspace = true }
-base64 = { workspace = true }
 anyhow = { workspace = true }
-crypto-hash = { workspace = true }
 itertools = { workspace = true }
+sweat-jar-model = { workspace = true, features = ["testing"] }

contract/src/assert.rs

@@ -1,16 +1,11 @@
 use near_sdk::require;
-use sweat_jar_model::TokenAmount;
 
-use crate::{common::Timestamp, jar::model::Jar, product::model::Product};
+use crate::jar::model::{Jar, JarVersionedLegacy};
 
-pub(crate) fn assert_not_locked(jar: &Jar) {
+pub(crate) fn assert_not_locked_legacy(jar: &JarVersionedLegacy) {
     require!(!jar.is_pending_withdraw, "Another operation on this Jar is in progress");
 }
 
-pub(crate) fn assert_sufficient_balance(jar: &Jar, amount: TokenAmount) {
-    require!(jar.principal >= amount, "Insufficient balance");
-}
-
-pub(crate) fn assert_is_liquidable(jar: &Jar, product: &Product, now: Timestamp) {
-    require!(jar.is_liquidable(product, now), "The jar is not mature yet");
+pub(crate) fn assert_not_locked(jar: &Jar) {
+    require!(!jar.is_pending_withdraw, "Another operation on this Jar is in progress");
 }