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.

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

Migrate (SDK 5.1.0) and reorganize #64

Merged
merged 28 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
dd327d9
fix integration test
garikbesson Feb 15, 2024
89bca73
fix integration tests
garikbesson Feb 22, 2024
bf151c8
Update marketplace logic, rs integration tests
garikbesson Feb 29, 2024
14f48bf
fix deriving borsh
garikbesson Mar 20, 2024
9346c02
using NearToken in some operations
garikbesson Mar 20, 2024
8b63469
fix JsonSchema errors
garikbesson Mar 20, 2024
bc914c5
fix StorageKey functionality
garikbesson Mar 20, 2024
aea460d
fix types and jsonschema
garikbesson Mar 20, 2024
9b5a928
fix nft-contract tests
garikbesson Mar 20, 2024
4008533
migrated nft-series contract
garikbesson Mar 21, 2024
b6c2446
migrate market-contract + tests
garikbesson Mar 21, 2024
adafdac
migrate integration tests
garikbesson Mar 21, 2024
680463f
migration integration tests
garikbesson Mar 25, 2024
546389f
creating several contracts for docs
garikbesson Mar 29, 2024
2cee79b
clearing basic contract in order to build it from the scratch
garikbesson Mar 29, 2024
d4568b2
splitted contracts into different stages
garikbesson Apr 1, 2024
6092c1d
fixed rust integration tests after migration
garikbesson Apr 1, 2024
3c330b7
fixed ts tests
garikbesson Apr 1, 2024
fb6f65f
fixed styles, added events.rs file to the skeleton
garikbesson Apr 2, 2024
f02c437
moved events functionality to separate folder
garikbesson Apr 2, 2024
ea86984
removed duplicated comments
garikbesson Apr 2, 2024
237983c
added option parameter memo to internal_transfer (basic contract)
garikbesson Apr 26, 2024
01c73d0
improved listing logic
gagdiez Apr 26, 2024
5dc2161
format
gagdiez Apr 29, 2024
04e517c
returned the use U128/U64
garikbesson Apr 29, 2024
51a2868
using U types for payouts
garikbesson Apr 29, 2024
b74c2f4
removed unnecessary type cast
garikbesson Apr 29, 2024
a389954
using U128 in creating series
garikbesson Apr 29, 2024
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
39 changes: 10 additions & 29 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,19 @@ jobs:
steps:
- name: Checkout branch
uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
- name: Build smart contract
run: npm run build
- name: Run integration test
run: cd integration-tests && cargo run --example integration-tests
- name: Run unit tests
run: npm run test:unit
integration-tests:
name: Integration tests
strategy:
matrix:
platform: [ubuntu-latest] # , windows-latest, macos-latest]
runs-on: ${{ matrix.platform }}
env:
RUST_BACKTRACE: 1
steps:
- name: Checkout branch
uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
- name: Build smart contract
run: npm run build
- name: Run Rust integration tests
run: npm run test:integration:rs
- name: Run TS integration tests
run: npm run test:integration:ts
run: cd market-contract && cargo test
run: cd ../nft-contract && cargo test
run: cd ../nft-contract-approval && cargo test
run: cd ../nft-contract-basic && cargo test
run: cd ../nft-contract-events && cargo test
run: cd ../nft-contract-royalty && cargo test
run: cd ../nft-contract-skeleton && cargo test
run: cd ../nft-series && cargo test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ notes

# misc
.DS_Store
.vscode
.env.local
.env.development.local
.env.test.local
Expand Down
15 changes: 15 additions & 0 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "nonfungible-token-integration-tests"
version = "1.0.0"
publish = false
edition = "2021"

[dev-dependencies]
near-sdk = { version = "5.1.0", features = ["unit-testing"] }
near-workspaces = { version = "0.10.0", features = ["unstable"] }
tokio = { version = "1.12.0", features = ["full"] }
serde_json = "1"

[[example]]
name = "integration-tests"
path = "src/tests.rs"
23 changes: 0 additions & 23 deletions integration-tests/rs/Cargo.toml

This file was deleted.

Loading