refactor: integrated nitka (#78)

* refactor: integrated nitka

* fix: removed unused borsh

Author: VladasZ

Cargo.lock

@@ -14,15 +14,15 @@ futures = "0.3.28"
 num-format = "0.4.4"
 itertools = "0.12.1"
 ed25519-dalek = { version = "2.0.0", features = ["rand_core"] }
-base64 = "0.21.3"
+base64 = "0.22.0"
 sha256 = "1.3.0"
 mutants = "0.0.3"
 
-integration-trait = { git = "https://github.com/sweatco/integration-utils.git", rev = "e54dc392ef42837123dd2c0ad19b6d6b815192d7" }
-integration-utils = { git = "https://github.com/sweatco/integration-utils.git", rev = "e54dc392ef42837123dd2c0ad19b6d6b815192d7" }
+nitka = "0.1.1"
+nitka-proc = "0.1.1"
 
 sweat-jar-model = { path = "model" }
-sweat-model = { git = "https://github.com/sweatco/sweat-near", rev = "bb9acde42fd6ef4f3e4c2a69d4ade8503df40f4a" }
+sweat-model = { git = "https://github.com/sweatco/sweat-near", rev = "1fee5d917dc1f2eeb91ba4ac65eef35f173e9a47" }
 
 near-workspaces = "0.10.0"
 near-sdk = { git = "https://github.com/sweatco/near-sdk-rs", rev = "8c48b26cc48d969c1e5f3162141fe9c824fccecd" }

Cargo.toml

@@ -33,7 +33,7 @@ cov: ##@Testing Run unit tests with coverage.
 	cargo llvm-cov --hide-instantiations --open --ignore-filename-regex tests.rs
 
 test: ##@Testing Run unit tests.
-	cargo test --package sweat-jar-model && \
+	cargo test --package sweat-jar-model --features=release-api && \
 	cargo test --package sweat_jar
 
 integration: ##@Testing Run integration tests.

Makefile

@@ -8,8 +8,10 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [features]
-default = []
-integration-test = ["sweat-jar-model/integration-methods"]
+default = ["release"]
+release = ["sweat-jar-model/release-api"]
+integration-test = ["sweat-jar-model/release-api", "sweat-jar-model/integration-methods"]
+integration-api = ["sweat-jar-model/integration-api"]
 
 [dependencies]
 ed25519-dalek = { workspace = true }

contract/Cargo.toml

@@ -21,12 +21,11 @@ ed25519-dalek = { workspace = true }
 base64 = { workspace = true }
 mutants = { workspace = true }
 
-sweat-jar-model = { workspace = true, features = ["integration-test", "integration-methods"] }
-sweat-model = { workspace = true, features = ["integration-test"] }
-integration-utils = { workspace = true }
+sweat-jar-model = { workspace = true, features = ["integration-test", "integration-methods", "integration-api"] }
+sweat-model = { workspace = true, features = ["integration-api"] }
+nitka = { workspace = true }
 near-workspaces = { workspace = true }
 
-borsh = "0.10.3"
 maplit = "1.0"
 near-units = "0.2.0"
 # arbitrary_precision enabled for u128 types that workspaces requires for Balance types

integration-tests/Cargo.toml

@@ -1,4 +1,4 @@
-use integration_utils::misc::ToNear;
+use nitka::misc::ToNear;
 use sweat_jar_model::{
     api::{ClaimApiIntegration, JarApiIntegration, ProductApiIntegration},
     claimed_amount_view::ClaimedAmountView,

integration-tests/src/claim_detailed.rs

@@ -1,14 +1,14 @@
 use anyhow::Result;
 use async_trait::async_trait;
-use integration_utils::misc::ToNear;
 use near_sdk::json_types::U128;
 use near_workspaces::Account;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{InitApiIntegration, ProductApiIntegration, SweatJarContract};
 use sweat_model::{StorageManagementIntegration, SweatApiIntegration, SweatContract};
 
 use crate::product::RegisterProductCommand;
 
-pub type Context = integration_utils::context::Context<near_workspaces::network::Sandbox>;
+pub type Context = nitka::context::Context<near_workspaces::network::Sandbox>;
 
 pub const FT_CONTRACT: &str = "sweat";
 pub const SWEAT_JAR: &str = "sweat_jar";

integration-tests/src/context.rs

@@ -1,4 +1,4 @@
-use integration_utils::misc::ToNear;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{ClaimApiIntegration, JarApiIntegration, ProductApiIntegration};
 use sweat_model::FungibleTokenCoreIntegration;
 

integration-tests/src/happy_flow.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
-use integration_utils::{contract_call::ContractCall, misc::ToNear};
 use near_sdk::{json_types::U128, Timestamp};
 use near_workspaces::{types::NearToken, Account};
+use nitka::{contract_call::ContractCall, misc::ToNear};
 use serde_json::{json, Value};
 use sweat_jar_model::{api::SweatJarContract, jar::JarId};
 use sweat_model::{FungibleTokenCoreIntegration, SweatContract};

integration-tests/src/jar_contract_extensions.rs

@@ -1,4 +1,4 @@
-use integration_utils::misc::ToNear;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{ClaimApiIntegration, JarApiIntegration, WithdrawApiIntegration};
 
 use crate::{

integration-tests/src/jar_deletion.rs

@@ -3,8 +3,8 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use integration_utils::misc::ToNear;
 use near_workspaces::types::Gas;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{JarApiIntegration, PenaltyApiIntegration};
 
 use crate::{

integration-tests/src/measure/batch_penalty.rs

@@ -3,8 +3,8 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use integration_utils::misc::ToNear;
 use near_workspaces::types::Gas;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::JarApiIntegration;
 
 use crate::{

integration-tests/src/measure/restake.rs

@@ -3,8 +3,8 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use integration_utils::misc::ToNear;
 use near_workspaces::types::Gas;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{JarApiIntegration, WithdrawApiIntegration};
 
 use crate::{

integration-tests/src/measure/withdraw.rs

@@ -1,8 +1,7 @@
 use anyhow::Result;
 use fake::Fake;
-use integration_utils::{contract_call::set_integration_logs_enabled, misc::ToNear};
-use near_sdk::AccountId;
 use near_workspaces::types::NearToken;
+use nitka::{contract_call::set_integration_logs_enabled, misc::ToNear};
 use sweat_jar_model::{
     api::{
         IntegrationTestMethodsIntegration, JarApiIntegration, MigrationToClaimRemainderIntegration, SweatJarContract,
@@ -52,7 +51,7 @@ async fn migrate_to_claim_roundings() -> Result<()> {
     let mut accounts = Vec::with_capacity(users_count);
 
     for _ in 0..users_count {
-        accounts.push(AccountId::new_unchecked(64.fake::<String>().to_ascii_lowercase()));
+        accounts.push(64.fake::<String>().to_ascii_lowercase().try_into().unwrap());
     }
 
     let elapsed = now.elapsed();

integration-tests/src/migrations/claim_rounding.rs

@@ -1,5 +1,5 @@
-use integration_utils::misc::ToNear;
 use near_workspaces::types::NearToken;
+use nitka::misc::ToNear;
 use serde_json::json;
 use sweat_jar_model::api::{InitApiIntegration, JarApiIntegration, ProductApiIntegration};
 use sweat_model::{FungibleTokenCoreIntegration, StorageManagementIntegration, SweatApiIntegration};

integration-tests/src/migrations/defi.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use integration_utils::misc::ToNear;
 use near_sdk::json_types::U128;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{InitApiIntegration, JarApiIntegration, ProductApiIntegration, SweatJarContract};
 use sweat_model::{FungibleTokenCoreIntegration, StorageManagementIntegration, SweatApiIntegration, SweatContract};
 

integration-tests/src/migrations/new_sdk.rs

@@ -1,7 +1,7 @@
 use base64::{engine::general_purpose::STANDARD, Engine};
 use ed25519_dalek::Signer;
-use integration_utils::misc::ToNear;
 use near_sdk::env::sha256;
+use nitka::misc::ToNear;
 use serde_json::from_value;
 use sweat_jar_model::api::{JarApiIntegration, PenaltyApiIntegration, ProductApiIntegration};
 

integration-tests/src/premium_product.rs

@@ -1,4 +1,4 @@
-use integration_utils::misc::ToNear;
+use nitka::misc::ToNear;
 use sweat_jar_model::api::{ClaimApiIntegration, JarApiIntegration};
 
 use crate::{

integration-tests/src/restake.rs

@@ -1,4 +1,4 @@
-use integration_utils::misc::ToNear;
+use nitka::misc::ToNear;
 use sweat_jar_model::{api::WithdrawApiIntegration, U32};
 use sweat_model::FungibleTokenCoreIntegration;
 

integration-tests/src/withdraw_fee.rs

@@ -10,15 +10,18 @@ name = "sweat_jar_model"
 
 [features]
 default = []
-integration-test = ["dep:integration-utils", "dep:near-workspaces"]
 integration-methods = []
+integration-test = ["dep:nitka", "dep:near-workspaces"]
+integration-api = ["dep:nitka", "dep:near-workspaces"]
+release-api = []
 
 
 [dependencies]
 anyhow = { workspace = true }
 near-sdk = { workspace = true }
 async-trait = { workspace = true }
-integration-trait = { workspace = true }
 
-integration-utils = { workspace = true, optional = true }
+nitka-proc = { workspace = true }
+nitka = { workspace = true, optional = true }
+
 near-workspaces = { workspace = true, optional = true }

model/Cargo.toml

@@ -1,8 +1,12 @@
-use integration_trait::make_integration_version;
+#[cfg(feature = "release-api")]
+use near_sdk::AccountId;
 use near_sdk::{
     json_types::{Base64VecU8, U128},
-    AccountId, PromiseOrValue,
+    PromiseOrValue,
 };
+#[cfg(feature = "integration-api")]
+use nitka::AccountId;
+use nitka_proc::make_integration_version;
 
 use crate::{
     claimed_amount_view::ClaimedAmountView,

model/src/api.rs

@@ -4,6 +4,6 @@ set -eox pipefail
 echo ">> Building contract"
 
 rustup target add wasm32-unknown-unknown
-cargo build -p sweat_jar --target wasm32-unknown-unknown --profile=contract --features integration-test
+cargo build -p sweat_jar --target wasm32-unknown-unknown --profile=contract --features integration-test,
 
 cp ./target/wasm32-unknown-unknown/contract/sweat_jar.wasm res/sweat_jar.wasm

res/sweat_jar.wasm

@@ -3,7 +3,7 @@ set -eox pipefail
 
 rustup component add clippy
 
-cargo clippy --all \
+cargo clippy -p sweat_jar \
   -- \
   \
   -W clippy::all \