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

refactor: Merge core-backend-common and core-backend-sandbox #3249

Merged
merged 46 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6ab7136
Move state.rs into sandbox backend
ark0f Sep 7, 2023
a70b56c
Move funcs.rs into sandbox backend
ark0f Sep 7, 2023
3a4453c
Remove `backend_common::Runtime`
ark0f Sep 7, 2023
64b298c
Move `syscall_trace` to funcs.rs
ark0f Sep 7, 2023
5edfec5
Inline `BackendState`
ark0f Sep 8, 2023
11cc05b
Inline `BackendTermination`
ark0f Sep 8, 2023
66b0a25
Inline `Environment`
ark0f Sep 8, 2023
e926946
Move `EnvironmentError` into sandbox backend
ark0f Sep 8, 2023
9b762ce
Move `ExtInfo` into core-processor
ark0f Sep 8, 2023
eab6671
Move `SystemReservationContext` into core-processor
ark0f Sep 8, 2023
7f23ea5
Move `BackendReport` into sandbox backend
ark0f Sep 8, 2023
001d5b6
Remove `MemoryAccessRecorder`
ark0f Sep 8, 2023
d6c7451
Remove `MemoryOwner`
ark0f Sep 8, 2023
1c2239b
Move `memory.rs` into sandbox backend
ark0f Sep 9, 2023
e1baf55
Move errors into sandbox backend
ark0f Sep 9, 2023
d265400
Fix `no_std`
ark0f Sep 9, 2023
6e9cbbf
Move `PTR_SPECIAL` into sandbox backend
ark0f Sep 9, 2023
6121bd6
Rename `gear-lazy-pages-common` to `gear-lazy-pages-interface`
ark0f Sep 9, 2023
4a9908c
Introduce `gear-lazy-pages-common`
ark0f Sep 9, 2023
4515f93
Move `LimitedStr` into core
ark0f Sep 10, 2023
8ae4609
Remove `gear-backend-common`
ark0f Sep 10, 2023
79bba62
Move sandbox backend into `core-backend` root
ark0f Sep 10, 2023
45dd1b5
Remove `Sandbox` prefixes from types in backend
ark0f Sep 10, 2023
11e238a
Fix benches and tests
ark0f Sep 11, 2023
ea0220b
Fix Cargo.lock
ark0f Sep 11, 2023
c140b7b
Fix after-rebase mess
ark0f Sep 18, 2023
f430afb
Fix `make doc`
ark0f Sep 18, 2023
04a447b
Fix docs
ark0f Sep 18, 2023
0325938
Merge remote-tracking branch 'origin/master' into al-backend-post-rem…
ark0f Sep 19, 2023
557e431
Merge remote-tracking branch 'origin/master' into al-backend-post-rem…
ark0f Sep 20, 2023
c5df03c
Update Cargo.lock
ark0f Sep 20, 2023
a6e8e08
Merge remote-tracking branch 'origin/master' into al-backend-post-rem…
ark0f Sep 24, 2023
616e780
Import `gear-lazy-pages-common` without default features
ark0f Sep 24, 2023
d3d7d4f
Derive crate fields from workspace
ark0f Sep 24, 2023
bf214ca
Remove unused `CallerWrap::unreachable_error`
ark0f Sep 24, 2023
c4dcf14
Make some mods private
ark0f Sep 24, 2023
2df2a94
Move errors into their own module
ark0f Sep 24, 2023
f24a7e4
Remove `pub use` in lib.rs
ark0f Sep 24, 2023
2d30e7a
Rename `DefaultExecutorMemory`
ark0f Sep 24, 2023
d53f9d2
Fix docs
ark0f Sep 24, 2023
fa6e856
Fix benchmark imports
ark0f Sep 24, 2023
509ac61
Remove `as lazy_pages` imports
ark0f Sep 25, 2023
1a69416
Merge remote-tracking branch 'origin/master' into al-backend-post-rem…
ark0f Sep 25, 2023
ab93080
Fix import
ark0f Sep 25, 2023
0f5e8ce
Merge remote-tracking branch 'origin/master' into al-backend-post-rem…
ark0f Sep 26, 2023
15d64e5
Update core/src/str.rs
ark0f Sep 26, 2023
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
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