Skip to content

Commit

Permalink
refactor: Merge core-backend-common and core-backend-sandbox (#3249)
Browse files Browse the repository at this point in the history
  • Loading branch information
ark0f authored Sep 26, 2023
1 parent a033a22 commit 54f23c0
Show file tree
Hide file tree
Showing 69 changed files with 1,390 additions and 1,665 deletions.
119 changes: 54 additions & 65 deletions Cargo.lock

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

11 changes: 6 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ members = [
"common",
"common/codegen",
"core",
"core-backend/*",
"core-backend",
"core-backend/codegen",
"core-processor",
"core-errors",
"examples/async",
Expand Down Expand Up @@ -195,17 +196,17 @@ gsys = { path = "gsys" }
gtest = { path = "gtest" }
gmeta = { path = "gmeta" }
gear-authorship = { path = "node/authorship" }
gear-backend-codegen = { path = "core-backend/codegen" }
gear-backend-common = { path = "core-backend/common" }
gear-backend-sandbox = { path = "core-backend/sandbox", default-features = false }
gear-core-backend-codegen = { path = "core-backend/codegen" }
gear-core-backend = { path = "core-backend", default-features = false }
gear-call-gen = { path = "utils/call-gen" }
gear-common = { path = "common", default-features = false }
gear-common-codegen = { path = "common/codegen" }
gear-core = { path = "core" }
gear-core-errors = { path = "core-errors" }
gear-core-processor = { path = "core-processor", default-features = false }
gear-lazy-pages = { path = "lazy-pages" }
gear-lazy-pages-common = { path = "common/lazy-pages", default-features = false }
gear-lazy-pages-common = { path = "lazy-pages/common", default-features = false }
gear-lazy-pages-interface = { path = "lazy-pages/interface", default-features = false }
gear-node-testing = { path = "node/testing" }
gear-runtime = { path = "runtime/gear" }
gear-runtime-common = { path = "runtime/common", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ test-syscalls-integrity-release:
.PHONY: doc
doc:
@ RUSTDOCFLAGS="--enable-index-page --generate-link-to-definition -Zunstable-options -D warnings" cargo doc --no-deps \
-p galloc -p gclient -p gcore -p gear-backend-common -p gear-backend-sandbox \
-p galloc -p gclient -p gcore -p gear-core-backend \
-p gear-core -p gear-core-processor -p gear-lazy-pages -p gear-core-errors \
-p gmeta -p gstd -p gtest -p gear-wasm-builder -p gear-common \
-p pallet-gear -p pallet-gear-gas -p pallet-gear-messenger -p pallet-gear-payment \
Expand Down
20 changes: 16 additions & 4 deletions core-backend/sandbox/Cargo.toml → core-backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
[package]
name = "gear-backend-sandbox"
version = "0.1.0"
name = "gear-core-backend"
description = "Gear WASM backend"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true

[dependencies]
gear-core.workspace = true
gear-core-errors = { workspace = true, features = ["codec"] }
gear-backend-common.workspace = true
gsys ={ workspace = true }
gear-core-backend-codegen.workspace = true
gear-lazy-pages-common.workspace = true
gsys = { workspace = true }

gear-wasm-instrument.workspace = true
gear-sandbox.workspace = true
gear-sandbox-env.workspace = true

actor-system-error.workspace = true

blake2-rfc.workspace = true
# Use max_level_debug feature to remove tracing in sys-calls by default.
log.workspace = true
derive_more.workspace = true
codec.workspace = true

[dev-dependencies]
codec.workspace = true

[features]
default = ["std"]
std = ["gear-sandbox/std", "gear-wasm-instrument/std", "log/std"]
mock = []
2 changes: 1 addition & 1 deletion core-backend/codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "gear-backend-codegen"
name = "gear-core-backend-codegen"
description = "Code generation library for gear-core-backend"
keywords = ["gear", "wasm", "codegen"]
categories = ["wasm"]
Expand Down
32 changes: 0 additions & 32 deletions core-backend/common/Cargo.toml

This file was deleted.

Loading

0 comments on commit 54f23c0

Please sign in to comment.