diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3f1fc7a5ef..00ae69c510 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2922,7 +2922,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "tracing", "tracing-futures", "url", @@ -4198,7 +4198,6 @@ dependencies = [ "hyperlane-ethereum", "hyperlane-fuel", "hyperlane-sealevel", - "hyperlane-test", "itertools 0.12.0", "maplit", "mockall", @@ -4224,7 +4223,6 @@ dependencies = [ "tracing-test", "url", "walkdir", - "warp", "ya-gcp", ] @@ -4239,7 +4237,6 @@ dependencies = [ "borsh 0.9.3", "bs58 0.5.0", "bytes", - "config", "convert_case 0.6.0", "derive-new", "derive_more", @@ -4585,7 +4582,6 @@ dependencies = [ "hex 0.4.3", "hyperlane-core", "hyperlane-sealevel-interchain-security-module-interface", - "hyperlane-sealevel-mailbox", "hyperlane-sealevel-multisig-ism-message-id", "hyperlane-test-utils", "multisig-ism", @@ -4607,7 +4603,6 @@ dependencies = [ "borsh 0.9.3", "hyperlane-core", "hyperlane-sealevel-interchain-security-module-interface", - "hyperlane-sealevel-mailbox", "hyperlane-test-transaction-utils", "serializable-account-meta", "solana-program", @@ -4742,9 +4737,7 @@ dependencies = [ "ecdsa-signature", "hex 0.4.3", "hyperlane-core", - "hyperlane-sealevel-mailbox", "hyperlane-test-utils", - "serializable-account-meta", "solana-program", "solana-program-test", "solana-sdk", @@ -5475,16 +5468,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -5559,24 +5542,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - [[package]] name = "multisig-ism" version = "0.1.0" @@ -7296,7 +7261,6 @@ dependencies = [ "hyperlane-core", "hyperlane-cosmos", "hyperlane-cosmwasm-interface", - "jobserver", "k256 0.13.3", "macro_rules_attribute", "maplit", @@ -7717,12 +7681,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -8639,8 +8597,8 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite 0.17.2", - "tungstenite 0.17.3", + "tokio-tungstenite", + "tungstenite", "url", ] @@ -10191,23 +10149,11 @@ dependencies = [ "rustls 0.20.9", "tokio", "tokio-rustls 0.23.4", - "tungstenite 0.17.3", + "tungstenite", "webpki 0.22.4", "webpki-roots 0.22.6", ] -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.20.1", -] - [[package]] name = "tokio-util" version = "0.6.10" @@ -10539,25 +10485,6 @@ dependencies = [ "webpki-roots 0.22.6", ] -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "typeid" version = "1.0.0" @@ -10624,15 +10551,6 @@ dependencies = [ "static_assertions 1.1.0", ] -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.14" @@ -10859,37 +10777,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "warp" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", - "multer", - "percent-encoding", - "pin-project", - "rustls-pemfile 1.0.4", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-stream", - "tokio-tungstenite 0.20.1", - "tokio-util 0.7.10", - "tower-service", - "tracing", -] - [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" diff --git a/rust/hyperlane-base/Cargo.toml b/rust/hyperlane-base/Cargo.toml index 0564c06a7e..9a45dd7c46 100644 --- a/rust/hyperlane-base/Cargo.toml +++ b/rust/hyperlane-base/Cargo.toml @@ -43,7 +43,6 @@ tracing-futures.workspace = true tracing-subscriber = { workspace = true, features = ["json", "ansi"] } tracing.workspace = true url.workspace = true -warp.workspace = true ya-gcp.workspace = true backtrace = { workspace = true, optional = true } @@ -55,7 +54,6 @@ hyperlane-ethereum = { path = "../chains/hyperlane-ethereum" } hyperlane-fuel = { path = "../chains/hyperlane-fuel" } hyperlane-sealevel = { path = "../chains/hyperlane-sealevel" } hyperlane-cosmos = { path = "../chains/hyperlane-cosmos"} -hyperlane-test = { path = "../hyperlane-test" } # dependency version is determined by etheres rusoto_core = "*" diff --git a/rust/hyperlane-core/Cargo.toml b/rust/hyperlane-core/Cargo.toml index 2bb5f46d81..620b2c8237 100644 --- a/rust/hyperlane-core/Cargo.toml +++ b/rust/hyperlane-core/Cargo.toml @@ -17,7 +17,6 @@ bigdecimal.workspace = true borsh.workspace = true bs58.workspace = true bytes = { workspace = true, features = ["serde"] } -config = { workspace = true, optional = true } convert_case.workspace = true derive-new.workspace = true derive_more.workspace = true @@ -53,7 +52,7 @@ tokio = { workspace = true, features = ["rt", "time"] } [features] default = ["strum"] float = [] -test-utils = ["dep:config"] +test-utils = [] agent = ["ethers", "strum"] strum = ["dep:strum"] ethers = ["dep:ethers-core", "dep:ethers-contract", "dep:ethers-providers", "dep:primitive-types"] diff --git a/rust/sealevel/programs/ism/multisig-ism-message-id/Cargo.toml b/rust/sealevel/programs/ism/multisig-ism-message-id/Cargo.toml index 86b543fcd9..ef74601fed 100644 --- a/rust/sealevel/programs/ism/multisig-ism-message-id/Cargo.toml +++ b/rust/sealevel/programs/ism/multisig-ism-message-id/Cargo.toml @@ -20,7 +20,6 @@ account-utils = { path = "../../../libraries/account-utils" } ecdsa-signature = { path = "../../../libraries/ecdsa-signature" } hyperlane-core = { path = "../../../../hyperlane-core" } hyperlane-sealevel-interchain-security-module-interface = { path = "../../../libraries/interchain-security-module-interface" } -hyperlane-sealevel-mailbox = { path = "../../mailbox", features = ["no-entrypoint"] } multisig-ism = { path = "../../../libraries/multisig-ism" } serializable-account-meta = { path = "../../../libraries/serializable-account-meta" } diff --git a/rust/sealevel/programs/ism/test-ism/Cargo.toml b/rust/sealevel/programs/ism/test-ism/Cargo.toml index fe0c83f64a..5e55de75b2 100644 --- a/rust/sealevel/programs/ism/test-ism/Cargo.toml +++ b/rust/sealevel/programs/ism/test-ism/Cargo.toml @@ -18,7 +18,6 @@ solana-sdk = { workspace = true, optional = true } account-utils = { path = "../../../libraries/account-utils" } hyperlane-core = { path = "../../../../hyperlane-core" } hyperlane-sealevel-interchain-security-module-interface = { path = "../../../libraries/interchain-security-module-interface" } -hyperlane-sealevel-mailbox = { path = "../../mailbox", features = ["no-entrypoint"] } serializable-account-meta = { path = "../../../libraries/serializable-account-meta" } hyperlane-test-transaction-utils = { path = "../../../libraries/test-transaction-utils", optional = true } diff --git a/rust/sealevel/programs/validator-announce/Cargo.toml b/rust/sealevel/programs/validator-announce/Cargo.toml index 9720a05d43..16be3754b9 100644 --- a/rust/sealevel/programs/validator-announce/Cargo.toml +++ b/rust/sealevel/programs/validator-announce/Cargo.toml @@ -15,9 +15,7 @@ thiserror.workspace = true account-utils = { path = "../../libraries/account-utils" } ecdsa-signature = { path = "../../libraries/ecdsa-signature" } -hyperlane-sealevel-mailbox = { path = "../mailbox", features = ["no-entrypoint"] } hyperlane-core = { path = "../../../hyperlane-core" } -serializable-account-meta = { path = "../../libraries/serializable-account-meta" } [dev-dependencies] hex.workspace = true diff --git a/rust/utils/run-locally/Cargo.toml b/rust/utils/run-locally/Cargo.toml index 99b0e41c9b..cfabd4e74b 100644 --- a/rust/utils/run-locally/Cargo.toml +++ b/rust/utils/run-locally/Cargo.toml @@ -14,7 +14,6 @@ hyperlane-core = { path = "../../hyperlane-core", features = ["float"]} hyperlane-cosmos = { path = "../../chains/hyperlane-cosmos"} toml_edit.workspace = true k256.workspace = true -jobserver.workspace = true ripemd.workspace = true sha2.workspace = true serde.workspace = true