Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add integration test for iah #90

Merged
merged 11 commits into from
Sep 26, 2023
+317 −39
Merged

add integration test for iah #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8047b3f
add integration test for iah
sczembor Sep 22, 2023
6690f2a
Update contracts/oracle/Cargo.toml
sczembor Sep 25, 2023
8e75f3e
add check for specific error message
sczembor Sep 25, 2023
9faa1c7
Merge branch 'master' into integration_test_iah
sczembor Sep 25, 2023
cc5428b
Update contracts/oracle/tests/integration_test.rs
sczembor Sep 25, 2023
a9a49d2
apply code review suggestions
sczembor Sep 25, 2023
b11cb5f
remove unsued types
sczembor Sep 26, 2023
611178f
Merge branch 'master' into integration_test_iah
sczembor Sep 26, 2023
c70cc65
Update contracts/oracle/tests/integration_test.rs
sczembor Sep 26, 2023
ffac66c
Update contracts/oracle/tests/integration_test.rs
sczembor Sep 26, 2023
878a379
rename build_contract to deploy_contract
sczembor Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions contracts/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions contracts/easy-poll/tests/workspaces.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use anyhow::Ok;
use easy_poll::{PollResult, Results, Status};
use near_sdk::serde_json::json;
use near_units::parse_near;
use test_util::{build_contract, get_block_timestamp, registry_default};
use test_util::{deploy_contract, get_block_timestamp, registry_default};
use workspaces::{network::Sandbox, Account, AccountId, Contract, Worker};

async fn respond(
Expand Down Expand Up @@ -37,7 +37,7 @@ async fn init(worker: &Worker<Sandbox>) -> anyhow::Result<(Contract, Account, Ac
.await?;

// Setup easy-poll contract
let easy_poll_contract = build_contract(
let easy_poll_contract = deploy_contract(
&worker,
"./",
"new",
Expand Down
18 changes: 9 additions & 9 deletions contracts/kudos/tests/test_kudos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ mod utils;

use crate::types::*;
use crate::utils::*;
use test_util::{build_contract, gen_user_account, get_block_timestamp, transfer_near};
use kudos_contract::WrappedCid;
use kudos_contract::{utils::*, CommentId};
use kudos_contract::{Commentary, PROOF_OF_KUDOS_SBT_CLASS_ID};
use near_sdk::serde_json::{self, json, Value};
use near_sdk::AccountId;
use near_units::parse_near;
use std::collections::{BTreeMap, HashMap};
use test_util::{deploy_contract, gen_user_account, get_block_timestamp, transfer_near};

#[tokio::test]
async fn test_give_kudos() -> anyhow::Result<()> {
Expand Down Expand Up @@ -72,7 +72,7 @@ async fn test_give_kudos() -> anyhow::Result<()> {
.into_result()?;

// Setup NDC Kudos Contract
let kudos_contract = build_contract(
let kudos_contract = deploy_contract(
&worker,
"./",
"init",
Expand Down Expand Up @@ -169,9 +169,7 @@ async fn test_give_kudos() -> anyhow::Result<()> {
kudos_contract.id(),
user2_account.id(),
user1_account.id(),
serde_json::to_string(&hashtags)
.unwrap()
.escape_default(),
serde_json::to_string(&hashtags).unwrap().escape_default(),
)
);

Expand Down Expand Up @@ -342,7 +340,7 @@ async fn test_mint_proof_of_kudos_sbt() -> anyhow::Result<()> {
.into_result()?;

// Setup NDC Kudos Contract
let kudos_contract = build_contract(
let kudos_contract = deploy_contract(
&worker,
"./",
"init",
Expand Down Expand Up @@ -416,11 +414,13 @@ async fn test_mint_proof_of_kudos_sbt() -> anyhow::Result<()> {
let _ = mint_fv_sbt(
&iah_registry_id,
&admin_account,
&[user1_account.id(),
&[
user1_account.id(),
user2_account.id(),
user3_account.id(),
user4_account.id(),
user5_account.id()],
user5_account.id(),
],
now_ms,
now_ms + 86_400_000,
)
Expand Down Expand Up @@ -539,7 +539,7 @@ async fn test_mass_give_kudos() -> anyhow::Result<()> {
.into_result()?;

// Setup NDC Kudos Contract
let kudos_contract = build_contract(
let kudos_contract = deploy_contract(
&worker,
"./",
"init",
Expand Down
4 changes: 2 additions & 2 deletions contracts/kudos/tests/test_required_deposit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ mod types;
mod utils;

use crate::utils::*;
use test_util::{build_contract, gen_user_account, get_block_timestamp, transfer_near};
use kudos_contract::{utils::*, WrappedCid};
use kudos_contract::{GIVE_KUDOS_COST, LEAVE_COMMENT_COST, UPVOTE_KUDOS_COST};
use near_sdk::serde_json::json;
use near_units::parse_near;
use test_util::{deploy_contract, gen_user_account, get_block_timestamp, transfer_near};

#[tokio::test]
async fn test_required_deposit() -> anyhow::Result<()> {
Expand Down Expand Up @@ -68,7 +68,7 @@ async fn test_required_deposit() -> anyhow::Result<()> {
.into_result()?;

// Setup NDC Kudos Contract
let kudos_contract = build_contract(
let kudos_contract = deploy_contract(
&worker,
"./",
"init",
Expand Down
4 changes: 2 additions & 2 deletions contracts/kudos/tests/test_social_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ mod types;
mod utils;

use crate::utils::*;
use test_util::{build_contract, gen_user_account, transfer_near};
use kudos_contract::utils::*;
use kudos_contract::SOCIAL_DB_GRANT_WRITE_PERMISSION_COST;
use near_contract_standards::storage_management::{StorageBalance, StorageBalanceBounds};
use near_sdk::json_types::U128;
use near_sdk::serde_json::{self, json, Value};
use near_sdk::ONE_YOCTO;
use near_units::parse_near;
use test_util::{deploy_contract, gen_user_account, transfer_near};

#[tokio::test]
async fn test_social_db_required_deposit() -> anyhow::Result<()> {
Expand Down Expand Up @@ -71,7 +71,7 @@ async fn test_social_db_required_deposit() -> anyhow::Result<()> {
.into_result()?;

// Setup NDC Kudos Contract
let kudos_contract = build_contract(
let kudos_contract = deploy_contract(
&worker,
"./",
"init",
Expand Down
4 changes: 4 additions & 0 deletions contracts/oracle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ tokio.workspace = true
workspaces.workspace = true
near-units.workspace = true
tracing.workspace = true
near-crypto = "^0"
chrono = "0.4.26"

test-util = { path = "../test-util" }
Loading
Loading