diff --git a/Cargo.toml b/Cargo.toml index 8b3615a..ed8d8d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["fabric/rust", "relay", "tests"] +members = ["fabric", "relay", "tests"] [workspace.package] version = "0.1.1" @@ -12,7 +12,7 @@ homepage = "https://spacesprotocol.org" authors = ["Buffrr "] [workspace.dependencies] -fabric-resolver = { path = "fabric/rust", version = "0.1.1" } +fabric-resolver = { path = "fabric", version = "0.1.1" } libveritas = { version = "0.1" } libveritas_testutil = { version = "0.1" } diff --git a/fabric/rust/Cargo.toml b/fabric/Cargo.toml similarity index 95% rename from fabric/rust/Cargo.toml rename to fabric/Cargo.toml index 913b358..10075af 100644 --- a/fabric/rust/Cargo.toml +++ b/fabric/Cargo.toml @@ -14,10 +14,11 @@ categories = ["network-programming"] [lib] name = "fabric" +path = "rust/src/lib.rs" [[bin]] name = "fabric" -path = "src/main.rs" +path = "rust/src/main.rs" required-features = ["client"] [features] diff --git a/relay/Cargo.toml b/relay/Cargo.toml index 74d3bbd..eff19dd 100644 --- a/relay/Cargo.toml +++ b/relay/Cargo.toml @@ -11,7 +11,7 @@ path = "src/main.rs" [dependencies] clap = { version = "4", features = ["derive", "env"] } libveritas = { workspace = true } -resolver = { path = "../fabric/rust", package = "fabric-resolver", default-features = false } +resolver = { path = "../fabric", package = "fabric-resolver", default-features = false } spaces_protocol = { workspace = true } spaces_client = { workspace = true } spaces_nums = { workspace = true } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 299a013..1da503b 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] relay = { path = "../relay", features = ["testutil"] } axum = "0.8" -fabric = { path = "../fabric/rust", package = "fabric-resolver" } +fabric = { path = "../fabric", package = "fabric-resolver" } libveritas = { workspace = true } libveritas_testutil = { workspace = true } spaces_protocol = { workspace = true }