diff --git a/Cargo.toml b/Cargo.toml index 46b37053..5a7250e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,10 +14,7 @@ members = [ anyhow = "1" async-stream = "0.3.4" async-trait = "0.1.77" - -#casper-types = { git = "https://github.com/casper-network/casper-node", branch="feat-2.0" } -casper-types = { path = "../../casper-node/types" } - +casper-types = { git = "https://github.com/casper-network/casper-node", branch="feat-2.0" } casper-event-sidecar = { path = "./event_sidecar", version = "1.0.0" } casper-event-types = { path = "./types", version = "1.0.0" } casper-rpc-sidecar = { path = "./rpc_sidecar", version = "1.0.0" } @@ -32,3 +29,6 @@ toml = "0.5.8" tracing = { version = "0", default-features = false } tracing-subscriber = "0" serde = { version = "1", default-features = false } + +[patch.'https://github.com/casper-network/casper-node'] +casper-types = { path = "../casper-node/types" } \ No newline at end of file diff --git a/event_sidecar/Cargo.toml b/event_sidecar/Cargo.toml index 3b562cc0..f122706c 100644 --- a/event_sidecar/Cargo.toml +++ b/event_sidecar/Cargo.toml @@ -20,10 +20,7 @@ async-trait = "0.1.56" bytes = "1.2.0" casper-event-listener = { path = "../listener", version = "1.0.0" } casper-event-types.workspace = true - -#casper-types = { workspace = true, features = ["std", "json-schema"] } -casper-types = { path = "../../casper-node/types" } - +casper-types = { workspace = true, features = ["std", "json-schema"] } derive-new = "0.5.9" eventsource-stream = "0.2.3" futures = { workspace = true } @@ -58,10 +55,7 @@ wheelbuf = "0.2.0" [dev-dependencies] async-stream = { workspace = true } casper-event-types = { workspace = true, features = ["sse-data-testing"] } - -#casper-types = { workspace = true, features = ["std", "testing"] } -casper-types = { path = "../../casper-node/types" } - +casper-types = { workspace = true, features = ["std", "testing"] } colored = "2.0.0" futures-util = { workspace = true } once_cell = { workspace = true } diff --git a/listener/Cargo.toml b/listener/Cargo.toml index 2f199036..5dd2dab5 100644 --- a/listener/Cargo.toml +++ b/listener/Cargo.toml @@ -14,10 +14,7 @@ async-stream = { workspace = true } async-trait = { workspace = true } bytes = "1.2.0" casper-event-types.workspace = true - -#casper-types = { workspace = true, features = ["std"] } -casper-types = { path = "../../casper-node/types" } - +casper-types = { workspace = true, features = ["std"] } eventsource-stream = "0.2.3" futures = { workspace = true } futures-util = { workspace = true } diff --git a/rpc_sidecar/Cargo.toml b/rpc_sidecar/Cargo.toml index 7e185c73..30246721 100644 --- a/rpc_sidecar/Cargo.toml +++ b/rpc_sidecar/Cargo.toml @@ -18,11 +18,8 @@ base16 = "0.2.1" bincode = "1" bytes = "1.5.0" casper-json-rpc = { version = "1.0.0", path = "../json_rpc" } - -#casper-types = { workspace = true, features = ["datasize", "json-schema", "std"] } -casper-types = { path = "../../casper-node/types" } +casper-types = { workspace = true, features = ["datasize", "json-schema", "std"] } casper-binary-port = { path = "../../casper-node/binary_port" } - datasize = { workspace = true, features = ["detailed", "fake_clock-types"] } futures = { workspace = true } http = "0.2.1" @@ -46,10 +43,7 @@ warp = { version = "0.3.6", features = ["compression"] } [dev-dependencies] assert-json-diff = "2" - -#casper-types = { workspace = true, features = ["datasize", "json-schema", "std", "testing"] } -casper-types = { path = "../../casper-node/types" } - +casper-types = { workspace = true, features = ["datasize", "json-schema", "std", "testing"] } pretty_assertions = "0.7.2" regex = "1" tempfile = "3" diff --git a/types/Cargo.toml b/types/Cargo.toml index 35b3925e..2c508bae 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -11,10 +11,7 @@ repository = "https://github.com/casper-network/casper-sidecar/" [dependencies] base16 = "0.2.1" blake2 = { version = "0.9.0", optional = true } - -#casper-types = { workspace = true, features = ["std"] } -casper-types = { path = "../../casper-node/types" } - +casper-types = { workspace = true, features = ["std"] } hex-buffer-serde = "0.3.0" hex_fmt = "0.3.0" once_cell = { workspace = true }