Skip to content

Commit

Permalink
Update Integration utils (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
VladasZ authored Jan 11, 2024
1 parent 1c99ccf commit 1c3e9b4
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 13 deletions.
5 changes: 2 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ near-workspaces = "0.9.0"

near-sdk = { git = "https://github.com/sweatco/near-sdk-rs", rev = "8c48b26cc48d969c1e5f3162141fe9c824fccecd" }
near-contract-standards = { git = "https://github.com/sweatco/near-sdk-rs", rev = "8c48b26cc48d969c1e5f3162141fe9c824fccecd" }
integration-trait = { git = "https://github.com/sweatco/integration-utils.git", rev = "9a455faf70702e285eea39ae69a73a4d123b523f" }
integration-utils = { git = "https://github.com/sweatco/integration-utils.git", rev = "9a455faf70702e285eea39ae69a73a4d123b523f" }
integration-trait = { git = "https://github.com/sweatco/integration-utils.git", rev = "b3e5b747b930ebc04601146deda13f12615d5e01" }
integration-utils = { git = "https://github.com/sweatco/integration-utils.git", rev = "b3e5b747b930ebc04601146deda13f12615d5e01" }

sweat-model = { path = "model" }
sweat-integration = { path = "sweat-integration" }
4 changes: 1 addition & 3 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ tokio = { workspace = true }
near-units = "0.2.0"
borsh = "0.10.3"
maplit = "1.0"
# arbitrary_precision enabled for u128 types that workspaces requires for Balance types
serde_json = { version = "1.0.107", features = ["arbitrary_precision"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
pkg-config = "0.3.1"

[dependencies]
async-trait = "0.1.73"

sweat-model = { workspace = true }
sweat-model = { workspace = true, features = ["integration-test"] }
sweat-integration = { workspace = true }
integration-utils = { workspace = true }
3 changes: 1 addition & 2 deletions integration-tests/src/callback_attack.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#![cfg(test)]

use integration_utils::{integration_contract::IntegrationContract, misc::ToNear};
use near_sdk::json_types::U128;
use serde_json::json;
use near_sdk::{json_types::U128, serde_json::json};
use sweat_model::FungibleTokenCoreIntegration;

use crate::{
Expand Down
7 changes: 5 additions & 2 deletions model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name = "sweat-model"
version = "0.1.0"
edition = "2021"

[features]
default = []
integration-test = ["dep:integration-utils"]

[dependencies]
anyhow = { workspace = true }
async-trait = { workspace = true }
Expand All @@ -11,5 +15,4 @@ integration-trait = { workspace = true }
near-sdk = { workspace = true }
near-contract-standards = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
integration-utils = { workspace = true }
integration-utils = { workspace = true, optional = true }
Binary file modified res/sweat.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion sweat-integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ anyhow = { workspace = true }
async-trait = { workspace = true }
integration-utils = { workspace = true }

sweat-model = { workspace = true }
sweat-model = { workspace = true, features = ["integration-test"] }

near-units = "0.2.0"
near-sdk = { workspace = true }
Expand Down

0 comments on commit 1c3e9b4

Please sign in to comment.