Skip to content

Commit b4ac501

Browse files
authored
Merge pull request #64 from garikbesson/migrate-and-reorganize
Migrate (SDK 5.1.0) and reorganize
2 parents 65ef6bc + a389954 commit b4ac501

93 files changed

Lines changed: 4523 additions & 1751 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,19 @@ jobs:
1515
steps:
1616
- name: Checkout branch
1717
uses: actions/checkout@v2
18-
- name: Install Node
19-
uses: actions/setup-node@v2
2018
- name: Install Rust
2119
uses: actions-rs/toolchain@v1
2220
with:
2321
toolchain: stable
2422
target: wasm32-unknown-unknown
25-
- name: Build smart contract
26-
run: npm run build
23+
- name: Run integration test
24+
run: cd integration-tests && cargo run --example integration-tests
2725
- name: Run unit tests
28-
run: npm run test:unit
29-
integration-tests:
30-
name: Integration tests
31-
strategy:
32-
matrix:
33-
platform: [ubuntu-latest] # , windows-latest, macos-latest]
34-
runs-on: ${{ matrix.platform }}
35-
env:
36-
RUST_BACKTRACE: 1
37-
steps:
38-
- name: Checkout branch
39-
uses: actions/checkout@v2
40-
- name: Install Node
41-
uses: actions/setup-node@v2
42-
- name: Install Rust
43-
uses: actions-rs/toolchain@v1
44-
with:
45-
toolchain: stable
46-
target: wasm32-unknown-unknown
47-
- name: Build smart contract
48-
run: npm run build
49-
- name: Run Rust integration tests
50-
run: npm run test:integration:rs
51-
- name: Run TS integration tests
52-
run: npm run test:integration:ts
26+
run: cd market-contract && cargo test
27+
run: cd ../nft-contract && cargo test
28+
run: cd ../nft-contract-approval && cargo test
29+
run: cd ../nft-contract-basic && cargo test
30+
run: cd ../nft-contract-events && cargo test
31+
run: cd ../nft-contract-royalty && cargo test
32+
run: cd ../nft-contract-skeleton && cargo test
33+
run: cd ../nft-series && cargo test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ notes
2424

2525
# misc
2626
.DS_Store
27+
.vscode
2728
.env.local
2829
.env.development.local
2930
.env.test.local

integration-tests/Cargo.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[package]
2+
name = "nonfungible-token-integration-tests"
3+
version = "1.0.0"
4+
publish = false
5+
edition = "2021"
6+
7+
[dev-dependencies]
8+
near-sdk = { version = "5.1.0", features = ["unit-testing"] }
9+
near-workspaces = { version = "0.10.0", features = ["unstable"] }
10+
tokio = { version = "1.12.0", features = ["full"] }
11+
serde_json = "1"
12+
13+
[[example]]
14+
name = "integration-tests"
15+
path = "src/tests.rs"

integration-tests/rs/Cargo.toml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)