소스 검색

fix(cli): adjust jsonrpsee feature flags for CI (#6521)

Lucas Fernandes Nogueira 2 년 전
부모
커밋
332b3fc419
3개의 변경된 파일13개의 추가작업 그리고 98개의 파일을 삭제
  1. 7 95
      tooling/cli/Cargo.lock
  2. 4 1
      tooling/cli/Cargo.toml
  3. 2 2
      tooling/cli/src/mobile/mod.rs

+ 7 - 95
tooling/cli/Cargo.lock

@@ -441,7 +441,7 @@ checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8"
 dependencies = [
 dependencies = [
  "bitflags 1.3.2",
  "bitflags 1.3.2",
  "block",
  "block",
- "core-foundation 0.7.0",
+ "core-foundation",
  "core-graphics",
  "core-graphics",
  "foreign-types",
  "foreign-types",
  "libc",
  "libc",
@@ -532,17 +532,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 dependencies = [
 dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys",
  "libc",
  "libc",
 ]
 ]
 
 
@@ -552,12 +542,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
 [[package]]
 [[package]]
 name = "core-graphics"
 name = "core-graphics"
 version = "0.19.2"
 version = "0.19.2"
@@ -565,7 +549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
 checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
 dependencies = [
 dependencies = [
  "bitflags 1.3.2",
  "bitflags 1.3.2",
- "core-foundation 0.7.0",
+ "core-foundation",
  "foreign-types",
  "foreign-types",
  "libc",
  "libc",
 ]
 ]
@@ -1772,11 +1756,9 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e"
 checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e"
 dependencies = [
 dependencies = [
- "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-core",
  "jsonrpsee-server",
  "jsonrpsee-server",
  "jsonrpsee-types",
  "jsonrpsee-types",
- "jsonrpsee-ws-client",
 ]
 ]
 
 
 [[package]]
 [[package]]
@@ -1790,14 +1772,11 @@ dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "jsonrpsee-types",
  "pin-project",
  "pin-project",
- "rustls-native-certs",
  "soketto",
  "soketto",
  "thiserror",
  "thiserror",
  "tokio",
  "tokio",
- "tokio-rustls",
  "tokio-util",
  "tokio-util",
  "tracing",
  "tracing",
- "webpki-roots",
 ]
 ]
 
 
 [[package]]
 [[package]]
@@ -2445,12 +2424,6 @@ dependencies = [
  "syn 1.0.109",
  "syn 1.0.109",
 ]
 ]
 
 
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
 [[package]]
 [[package]]
 name = "openssl-src"
 name = "openssl-src"
 version = "111.25.2+1.1.1t"
 version = "111.25.2+1.1.1t"
@@ -3134,27 +3107,6 @@ dependencies = [
  "webpki",
  "webpki",
 ]
 ]
 
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
-dependencies = [
- "base64 0.21.0",
-]
-
 [[package]]
 [[package]]
 name = "ryu"
 name = "ryu"
 version = "1.0.13"
 version = "1.0.13"
@@ -3185,15 +3137,6 @@ dependencies = [
  "winapi-util",
  "winapi-util",
 ]
 ]
 
 
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
 [[package]]
 [[package]]
 name = "schemars"
 name = "schemars"
 version = "0.8.12"
 version = "0.8.12"
@@ -3252,29 +3195,6 @@ dependencies = [
  "untrusted",
  "untrusted",
 ]
 ]
 
 
-[[package]]
-name = "security-framework"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.3",
- "core-foundation-sys 0.8.3",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
-dependencies = [
- "core-foundation-sys 0.8.3",
- "libc",
-]
-
 [[package]]
 [[package]]
 name = "selectors"
 name = "selectors"
 version = "0.22.0"
 version = "0.22.0"
@@ -3747,6 +3667,9 @@ dependencies = [
  "itertools",
  "itertools",
  "json-patch 0.2.7",
  "json-patch 0.2.7",
  "jsonrpsee",
  "jsonrpsee",
+ "jsonrpsee-client-transport",
+ "jsonrpsee-core",
+ "jsonrpsee-ws-client",
  "jsonschema",
  "jsonschema",
  "kuchiki",
  "kuchiki",
  "libc",
  "libc",
@@ -3810,7 +3733,7 @@ checksum = "3603ad10b7b18e53f486b6a3de15b51d23098ce800a30162cb634a1c61afff64"
 dependencies = [
 dependencies = [
  "cocoa",
  "cocoa",
  "colored 1.9.3",
  "colored 1.9.3",
- "core-foundation 0.7.0",
+ "core-foundation",
  "deunicode",
  "deunicode",
  "duct",
  "duct",
  "dunce",
  "dunce",
@@ -4043,17 +3966,6 @@ dependencies = [
  "syn 1.0.109",
  "syn 1.0.109",
 ]
 ]
 
 
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls",
- "tokio",
- "webpki",
-]
-
 [[package]]
 [[package]]
 name = "tokio-stream"
 name = "tokio-stream"
 version = "0.1.12"
 version = "0.1.12"

+ 4 - 1
tooling/cli/Cargo.toml

@@ -44,7 +44,10 @@ openssl-vendored = [ "tauri-mobile/openssl-vendored" ]
 [dependencies]
 [dependencies]
 tauri-mobile = { version = "0.2.5", default-features = false }
 tauri-mobile = { version = "0.2.5", default-features = false }
 textwrap = { version = "0.11.0", features = [ "term_size" ] }
 textwrap = { version = "0.11.0", features = [ "term_size" ] }
-jsonrpsee = { version = "0.16", features = [ "ws-client", "client-ws-transport-no-tls", "server" ] }
+jsonrpsee = { version = "0.16", features = [ "server" ] }
+jsonrpsee-core = "0.16"
+jsonrpsee-client-transport = { version = "0.16", features = ["ws"] }
+jsonrpsee-ws-client = { version = "0.16", default-features = false }
 thiserror = "1"
 thiserror = "1"
 sublime_fuzzy = "0.7"
 sublime_fuzzy = "0.7"
 clap = { version = "4.0", features = [ "derive" ] }
 clap = { version = "4.0", features = [ "derive" ] }

+ 2 - 2
tooling/cli/src/mobile/mod.rs

@@ -12,10 +12,10 @@ use crate::{
   interface::{AppInterface, AppSettings, DevProcess, Interface, Options as InterfaceOptions},
   interface::{AppInterface, AppSettings, DevProcess, Interface, Options as InterfaceOptions},
 };
 };
 use anyhow::{bail, Result};
 use anyhow::{bail, Result};
-use jsonrpsee::client_transport::ws::WsTransportClientBuilder;
 use jsonrpsee::core::client::{Client, ClientBuilder, ClientT};
 use jsonrpsee::core::client::{Client, ClientBuilder, ClientT};
-use jsonrpsee::rpc_params;
 use jsonrpsee::server::{RpcModule, ServerBuilder, ServerHandle};
 use jsonrpsee::server::{RpcModule, ServerBuilder, ServerHandle};
+use jsonrpsee_client_transport::ws::WsTransportClientBuilder;
+use jsonrpsee_core::rpc_params;
 use serde::{Deserialize, Serialize};
 use serde::{Deserialize, Serialize};
 use shared_child::SharedChild;
 use shared_child::SharedChild;