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

Stable Toolchain #217

Merged
merged 5 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 14 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,21 @@ members = [
"frc42_dispatch/macros",
"frc42_dispatch/macros/example",
"frc46_token",
"frc46_factory_token",
"frc46_factory_token/token_impl",
"frc53_nft",
"fvm_actor_utils",
"fvm_dispatch_tools",
"testing/fil_token_integration",
"testing/fil_token_integration/actors/basic_nft_actor",
"testing/fil_token_integration/actors/basic_receiving_actor",
"testing/fil_token_integration/actors/basic_token_actor",
"testing/fil_token_integration/actors/basic_transfer_actor",
"testing/fil_token_integration/actors/frc46_test_actor",
"testing/fil_token_integration/actors/frc53_test_actor"
"testing/integration",
"testing/test_actors",
"testing/test_actors/actors/*",
"testing/test_actors/actors/frc46_factory_token/token_impl",
]

[profile.wasm]
inherits = "release"
panic = "abort"
overflow-checks = false
lto = true
opt-level = "z"
strip = true
codegen-units = 1
incremental = false
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test: install-toolchain
test-coverage: install-toolchain
cargo test --workspace \
--exclude greeter \
--exclude fil_token_integration_tests \
--exclude helix_integration_tests \
--exclude basic_token_actor \
--exclude basic_receiving_actor \
--exclude basic_nft_actor \
Expand All @@ -29,7 +29,7 @@ test-coverage: install-toolchain

# separate actor testing stage to run from CI without coverage support
test-actors: install-toolchain
cargo test --package greeter --package fil_token_integration_tests
cargo test --package greeter --package helix_integration_tests

install-toolchain:
rustup update
Expand Down
9 changes: 2 additions & 7 deletions dispatch_examples/greeter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ fvm_ipld_encoding = "~0.3"
fvm_sdk = "~3.2"
fvm_shared = "~3.2"

[dev-dependencies]
cid = { version = "0.8.5", default-features = false }
fvm = { version = "^3.0.0", default-features = false }
fvm_integration_tests = "~3.0"
actors-v10 = { package = "fil_builtin_actors_bundle", git = "https:/filecoin-project/builtin-actors", rev = "09aa10f082565565b08572532b245236525f778c" }

[build-dependencies]
substrate-wasm-builder = "4.0"
[lib]
crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
12 changes: 0 additions & 12 deletions dispatch_examples/greeter/build.rs

This file was deleted.

82 changes: 0 additions & 82 deletions dispatch_examples/greeter/tests/greet.rs

This file was deleted.

28 changes: 0 additions & 28 deletions frc46_factory_token/Cargo.toml

This file was deleted.

12 changes: 0 additions & 12 deletions frc46_factory_token/build.rs

This file was deleted.

Loading
Loading