Skip to content

Commit 6521cf7

Browse files
authored
Merge pull request #225 from near-examples/reorganize-and-update
Reorganize and update
2 parents 10d9bfd + e641671 commit 6521cf7

35 files changed

+1541
-1917
lines changed

.github/dependabot.yml

-16
This file was deleted.

.github/scripts/readme-quick-deploy.sh

-73
This file was deleted.

.github/workflows/readme-ci.yml

-27
This file was deleted.

.github/workflows/tests.yml

+6-26
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,13 @@
11
name: Tests
2-
on:
3-
repository_dispatch:
4-
types: [tests-report]
5-
push:
2+
on: push
63
jobs:
74
tests:
85
strategy:
96
matrix:
10-
platform: [ubuntu-latest] # mac-os currently in progress
7+
platform: [ubuntu-latest, macos-latest]
118
runs-on: ${{ matrix.platform }}
129
steps:
13-
- name: Checkout branch
14-
uses: actions/checkout@v2
15-
- name: Install Node
16-
uses: actions/setup-node@v3
17-
with:
18-
node-version: 16
19-
- name: Install Rust
20-
uses: actions-rs/toolchain@v1
21-
with:
22-
toolchain: stable
23-
target: wasm32-unknown-unknown
24-
- name: Build wasm files
25-
run: source scripts/flags.sh && rustup target add wasm32-unknown-unknown && cargo build --all --target wasm32-unknown-unknown --release && cp target/wasm32-unknown-unknown/release/*.wasm ./res/
26-
- name: Run unit tests
27-
env:
28-
IS_GITHUB_ACTION: true
29-
run: cd nft && cargo test -- --nocapture --color=always
30-
- name: Run Rust integration tests
31-
run: cd integration-tests/rs && cargo run --example integration-tests
32-
- name: Run TypeScript integration tests
33-
run: cd integration-tests/ts && npm i && npm run test
10+
- uses: actions/checkout@v4
11+
- name: Install and test modules
12+
run: |
13+
cargo test

.gitpod.Dockerfile

-6
This file was deleted.

.gitpod.yml

-7
This file was deleted.

Cargo.toml

+16-22
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
[profile.release]
2-
codegen-units = 1
3-
# Tell `rustc` to optimize for small code size.
4-
opt-level = "z"
5-
lto = true
6-
debug = false
7-
panic = "abort"
8-
overflow-checks = true
1+
[package]
2+
name = "non-fungible-token"
3+
version = "1.1.0"
4+
authors = ["Near Inc <[email protected]>"]
5+
edition = "2018"
96

10-
[workspace]
11-
# remember to include a member for each contract
12-
members = [
13-
"nft",
14-
"test-approval-receiver",
15-
"test-token-receiver",
16-
]
17-
exclude = [
18-
"integration-tests"
19-
]
7+
[lib]
8+
crate-type = ["cdylib", "rlib"]
209

21-
# This can be removed when near-sdk is updated
22-
# Unfortuantely, this crate was yanked by the author and this is needed
23-
[patch.crates-io]
24-
parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1.git' }
10+
[dependencies]
11+
near-sdk = "5.5.0"
12+
near-contract-standards = "5.5.0"
13+
14+
[dev-dependencies]
15+
near-sdk = { version = "5.5.0", features = ["unit-testing"] }
16+
near-workspaces = { version = "0.14.1", features = ["unstable"] }
17+
anyhow = "1.0"
18+
tokio = { version = "1.41.0", features = ["full"] }

README-Windows.md

-98
This file was deleted.

0 commit comments

Comments
 (0)