Integrations tests to cargo tests (#11)

* integrations tests to cargo tests

* to dev deps

* separated withdrawal tests

* remove container after build, update bin

Makefile

@@ -13,10 +13,10 @@ cov:
 	./scripts/coverage.sh
 
 test:
-	cargo test --all
+	cargo test --package sweat_jar
 
 integration:
-	cargo run -p integration-tests
+	cargo test --package integration-tests
 
 int: integration
 

contract/Cargo.toml

@@ -11,7 +11,6 @@ crate-type = ["cdylib"]
 near-sdk = { workspace = true }
 
 near-contract-standards = "4.1.1"
-uint = { version = "0.9.3", default-features = false }
 ed25519-dalek = "1.0.1"
 near-self-update = { git = "https://github.com/sweatco/near-self-update.git", rev = "7064db3cdd924efc7fa7c00664920a2b482e7bcf" }
 

contract/src/ft_interface.rs

@@ -59,7 +59,7 @@ impl FtTransferPromise for Promise {
         let args = json!({
             "receiver_id": receiver_id,
             "amount": amount.to_string(),
-            "memo": memo.unwrap_or("".to_string()),
+            "memo": memo.unwrap_or_default(),
         })
         .to_string()
         .as_bytes()

contract/src/withdraw/api.rs

@@ -115,9 +115,9 @@ impl Contract {
                 WithdrawalFee::Fix(amount) => *amount,
                 WithdrawalFee::Percent(percent) => percent * jar.principal,
             })
-            .map(|fee| Fee {
-                amount: fee,
+            .map(|amount| Fee {
                 beneficiary_id: self.fee_account_id.clone(),
+                amount,
             })
     }
 }

integration-tests/Cargo.toml

@@ -4,10 +4,10 @@ version = "1.0.0"
 publish = false
 edition = "2021"
 
-[[bin]]
-name = "integration-tests"
+[lib]
+name = "integration_tests"
 
-[dependencies]
+[dev-dependencies]
 near-sdk = { workspace = true }
 
 anyhow = "1.0"

integration-tests/src/context.rs

@@ -24,11 +24,8 @@ impl Context {
         let worker = workspaces::sandbox().await?;
         let root_account = worker.dev_create_account().await?;
 
-        let jar_contract_path = env::args().nth(1).unwrap_or("res/sweat_jar.wasm".to_string());
-        let ft_contract_path = env::args().nth(2).unwrap_or("res/sweat.wasm".to_string());
-
-        let jar_contract = worker.dev_deploy(&Self::load_wasm(&jar_contract_path)).await?;
-        let ft_contract = worker.dev_deploy(&Self::load_wasm(&ft_contract_path)).await?;
+        let jar_contract = worker.dev_deploy(&Self::load_wasm("../res/sweat_jar.wasm")).await?;
+        let ft_contract = worker.dev_deploy(&Self::load_wasm("../res/sweat.wasm")).await?;
 
         println!("@@ jar contract deployed to {}", jar_contract.id());
         println!("@@ ft contract deployed to {}", ft_contract.id());

integration-tests/src/happy_flow.rs

@@ -1,6 +1,7 @@
 use crate::{common::ValueGetters, context::Context, product::RegisterProductCommand};
 
-pub(crate) async fn run() -> anyhow::Result<()> {
+#[tokio::test]
+async fn happy_flow() -> anyhow::Result<()> {
     println!("👷🏽 Run happy flow test");
 
     let mut context = Context::new().await?;