Coverage improvements

.cargo/config

@@ -1,2 +1,9 @@
-[build]
-rustflags = ["-C", "link-args=-s"]
+[profile.contract]
+inherits = "release"
+strip = true
+codegen-units = 1
+opt-level = "z"
+lto = true
+debug = false
+panic = "abort"
+overflow-checks = true

.github/workflows/push.yml

@@ -24,8 +24,16 @@ jobs:
           name: sweat-jar
           path: res/sweat_jar.wasm
 
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Lint
+        run: make lint
+
   unit-tests:
-    needs: [ build ]
+    needs: [ build, lint ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -34,7 +42,7 @@ jobs:
         run: make test
 
   integration-tests:
-    needs: [ build ]
+    needs: [ build, lint ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/test.yml

@@ -24,8 +24,16 @@ jobs:
           name: sweat-jar
           path: res/sweat_jar.wasm
 
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Lint
+        run: make lint
+
   unit-tests:
-    needs: [ build ]
+    needs: [ build, lint ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -34,7 +42,7 @@ jobs:
         run: make test
 
   integration-tests:
-    needs: [ build ]
+    needs: [ build, lint ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

Cargo.toml

@@ -1,18 +1,9 @@
 [workspace]
 
-default-members = ["contract"]
-members = ["contract", "integration-tests"]
-
 resolver = "2"
 
-[profile.release]
-codegen-units = 1
-opt-level = "z"
-lto = true
-debug = false
-panic = "abort"
-overflow-checks = true
-
+default-members = ["contract"]
+members = ["contract", "integration-tests"]
 
 [workspace.dependencies]
 near-sdk = "4.1.1"

Makefile

@@ -10,7 +10,7 @@ deploy:
 	./scripts/deploy.sh
 
 cov:
-	./scripts/coverage.sh
+	cargo llvm-cov --hide-instantiations --open
 
 test:
 	cargo test --package sweat_jar
@@ -22,3 +22,6 @@ int: integration
 
 fmt:
 	cargo +nightly fmt --all
+
+lint:
+	./scripts/lint.sh

contract/src/claim/mod.rs

@@ -6,7 +6,7 @@ mod tests {
 
     use crate::{
         claim::api::ClaimApi,
-        common::{tests::Context, UDecimal, U32},
+        common::{tests::Context, u32::U32, udecimal::UDecimal},
         jar::{api::JarApi, model::Jar},
         product::{
             model::{Apy, Product},
@@ -39,17 +39,15 @@ mod tests {
         let admin = accounts(1);
 
         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()]);
+        let jar = Jar::generate(0, &alice, &product.id).principal(100_000_000_000);
+        let mut context = Context::new(admin).with_products(&[product]).with_jars(&[jar.clone()]);
 
         context.set_block_timestamp_in_days(365);
 
         context.switch_account(&alice);
-        context.contract.claim_jars(vec![reference_jar.index], Some(U128(100)));
+        context.contract.claim_jars(vec![jar.index], Some(U128(100)));
 
-        let jar = context.contract.get_jar(U32(reference_jar.index));
+        let jar = context.contract.get_jar(U32(jar.index));
         assert_eq!(100, jar.claimed_balance.0);
     }
 

contract/src/common/mod.rs

@@ -0,0 +1,15 @@
+pub(crate) mod tests;
+pub(crate) mod u32;
+pub(crate) mod udecimal;
+
+/// Milliseconds since the Unix epoch (January 1, 1970 (midnight UTC/GMT))
+pub type Timestamp = u64;
+
+/// Duration in milliseconds
+pub type Duration = u64;
+
+/// Amount of fungible tokens
+pub type TokenAmount = u128;
+
+pub(crate) const MINUTES_IN_YEAR: u64 = 365 * 24 * 60;
+pub(crate) const MS_IN_MINUTE: u64 = 1000 * 60;