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

Restructure repository workspace #53

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
Open
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
41 changes: 18 additions & 23 deletions Cargo.lock

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

39 changes: 18 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
[workspace]
members = [
"bin/*",
"wasm/",
]

[workspace.package]
authors = [
"Daniel Olano <[email protected]>",
"Johan Alexis Duque Cadena <[email protected]>",
"Pablo Dorado <[email protected]>",
]
license = "GPL-3.0-or-later"

[package]
name = "valor_core"
description = "Virto Async Light Open Runtime"
license = "GPL-3.0-or-later"
edition = "2021"
name = "valor"
repository = "https://github.com/virto-network/valor"
version = "0.6.0"
authors = ["Daniel Olano <[email protected]>", "Johan Alexis Duque Cadena <[email protected]>"]
edition = "2018"
repository = "https://github.com/valibre-org/valor"

[dependencies]
clap = { version = "4.1.8", features = ["derive"] }
embassy-executor = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["log", "std", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["log", "std", "nightly"] }
embedded-io = { version = "0.4.0", features = ["async", "std"] }
env_logger = "0.10.0"
log = "0.4.17"
wasm_runtime = { path = "./wasm" }

[features]

[workspace]
members = [
"wasm",
]

# ToDo: Talk about this with @Dani
# [profile.release.package.valor_web]
# opt-level = "s"

[profile.release]
lto = true
strip = true
opt-level = "s"
strip = true

[profile.dev]
opt-level = 0

18 changes: 18 additions & 0 deletions bin/valor-run/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[package]
description = "CLI tool for running valor modules"
edition = "2021"
name = "valor-run"
version = "0.6.0"

[dependencies]
valor = {path = "../..", version = "0.6.0"}
wasm_runtime = {path = "../../wasm", version = "0.1.0"}

clap = {version = "4.1.8", features = ["derive"]}
embassy-executor = {version = "0.1.0", features = ["log", "std", "nightly", "integrated-timers"]}
embassy-time = {version = "0.1.0", features = ["log", "std", "nightly"]}
embedded-io = {version = "0.4.0", features = ["async", "std"]}
env_logger = "0.10.0"
log = "0.4.17"

[features]
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main.rs → bin/valor-run/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use log::{info, warn};

use std::io::stdin;
use std::thread;
use wasm_runtime::{Runtime, Wasm};
use valor_runtime::{Runtime, Wasm};

mod constants;
mod parsero;
Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions src/plugin/mod.rs → bin/valor-run/src/plugin/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ impl Plugin {
pub fn new_map(paths: Vec<String>, all_active: bool) -> HashMap<String, Self> {
let mut map_plugins = HashMap::<String, Self>::new();
for path in paths {
let active = if all_active { true } else { false };
let plugin = self::Plugin::new(path.clone(), active);
let plugin = self::Plugin::new(path.clone(), all_active);
map_plugins.insert(path, plugin);
}
map_plugins
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pub fn on_message() {}