Remove `tls-api-rustls` dependency

It was left over in zcash/librustzcash#317 from an earlier version that
used the `grpc` crate. The version imported into this repository had
been migrated to `zcash_client_backend 0.6` which switched to the
`tonic` crate for gRPC, which doesn't use `tls-api`.
This commit is contained in:
Jack Grigg 2023-07-05 02:36:02 +00:00
parent 62b58243ab
commit 6e7681f4ae
2 changed files with 31 additions and 302 deletions

332
Cargo.lock generated
View File

@ -49,15 +49,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "aho-corasick"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
[[package]]
name = "anyhow"
version = "1.0.71"
@ -109,17 +100,6 @@ dependencies = [
"syn 2.0.23",
]
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi 0.1.19",
"libc",
"winapi",
]
[[package]]
name = "autocfg"
version = "1.1.0"
@ -192,12 +172,6 @@ version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
[[package]]
name = "base64"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.2"
@ -232,7 +206,7 @@ dependencies = [
"log",
"num_cpus",
"pairing",
"rand_core 0.6.4",
"rand_core",
"rayon",
"subtle",
]
@ -245,7 +219,7 @@ checksum = "bef0f0152ec5cf17f49a5866afaa3439816207fd4f0a224c0211ffaf5e278426"
dependencies = [
"hmac",
"pbkdf2",
"rand 0.8.5",
"rand",
"sha2 0.10.7",
"unicode-normalization",
"zeroize",
@ -318,7 +292,7 @@ dependencies = [
"ff",
"group",
"pairing",
"rand_core 0.6.4",
"rand_core",
"subtle",
]
@ -556,19 +530,6 @@ version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "env_logger"
version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
dependencies = [
"atty",
"humantime",
"log",
"regex",
"termcolor",
]
[[package]]
name = "equihash"
version = "0.2.0"
@ -637,7 +598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"bitvec",
"rand_core 0.6.4",
"rand_core",
"subtle",
]
@ -677,12 +638,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "funty"
version = "2.0.0"
@ -776,7 +731,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"memuse",
"rand_core 0.6.4",
"rand_core",
"subtle",
]
@ -832,7 +787,7 @@ dependencies = [
"halo2_proofs",
"lazy_static",
"pasta_curves",
"rand 0.8.5",
"rand",
"subtle",
"uint",
]
@ -855,7 +810,7 @@ dependencies = [
"halo2_legacy_pdqsort",
"maybe-rayon",
"pasta_curves",
"rand_core 0.6.4",
"rand_core",
"tracing",
]
@ -889,15 +844,6 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]]
name = "hermit-abi"
version = "0.3.2"
@ -953,15 +899,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "humantime"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
dependencies = [
"quick-error",
]
[[package]]
name = "hyper"
version = "0.14.27"
@ -1041,7 +978,7 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.2",
"hermit-abi",
"libc",
"windows-sys",
]
@ -1080,7 +1017,7 @@ dependencies = [
"bls12_381",
"ff",
"group",
"rand_core 0.6.4",
"rand_core",
"subtle",
]
@ -1258,7 +1195,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi 0.3.2",
"hermit-abi",
"libc",
]
@ -1309,7 +1246,7 @@ dependencies = [
"memuse",
"nonempty",
"pasta_curves",
"rand 0.8.5",
"rand",
"reddsa",
"serde",
"subtle",
@ -1333,7 +1270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
dependencies = [
"base64ct",
"rand_core 0.6.4",
"rand_core",
"subtle",
]
@ -1347,7 +1284,7 @@ dependencies = [
"ff",
"group",
"lazy_static",
"rand 0.8.5",
"rand",
"static_assertions",
"subtle",
]
@ -1362,17 +1299,6 @@ dependencies = [
"password-hash",
]
[[package]]
name = "pem"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
dependencies = [
"base64 0.13.1",
"once_cell",
"regex",
]
[[package]]
name = "percent-encoding"
version = "2.3.0"
@ -1523,12 +1449,6 @@ dependencies = [
"prost",
]
[[package]]
name = "quick-error"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
version = "1.0.29"
@ -1544,19 +1464,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
[[package]]
name = "rand"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
dependencies = [
"fuchsia-cprng",
"libc",
"rand_core 0.3.1",
"rdrand",
"winapi",
]
[[package]]
name = "rand"
version = "0.8.5"
@ -1565,7 +1472,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core 0.6.4",
"rand_core",
]
[[package]]
@ -1575,24 +1482,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core 0.6.4",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
"rand_core 0.4.2",
]
[[package]]
name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]]
name = "rand_core"
version = "0.6.4"
@ -1624,15 +1516,6 @@ dependencies = [
"num_cpus",
]
[[package]]
name = "rdrand"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "reddsa"
version = "0.5.0"
@ -1645,7 +1528,7 @@ dependencies = [
"hex",
"jubjub",
"pasta_curves",
"rand_core 0.6.4",
"rand_core",
"serde",
"thiserror",
"zeroize",
@ -1657,7 +1540,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a60db2c3bc9c6fd1e8631fee75abc008841d27144be744951d6b9b75f9b569c"
dependencies = [
"rand_core 0.6.4",
"rand_core",
"reddsa",
"serde",
"thiserror",
@ -1699,8 +1582,6 @@ version = "1.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
@ -1710,15 +1591,6 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "remove_dir_all"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi",
]
[[package]]
name = "ring"
version = "0.16.20"
@ -1729,7 +1601,7 @@ dependencies = [
"libc",
"once_cell",
"spin",
"untrusted 0.7.1",
"untrusted",
"web-sys",
"winapi",
]
@ -1780,19 +1652,6 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "rustls"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
"base64 0.13.1",
"log",
"ring",
"sct 0.6.1",
"webpki",
]
[[package]]
name = "rustls"
version = "0.21.2"
@ -1802,7 +1661,7 @@ dependencies = [
"log",
"ring",
"rustls-webpki",
"sct 0.7.0",
"sct",
]
[[package]]
@ -1811,7 +1670,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
"base64 0.21.2",
"base64",
]
[[package]]
@ -1821,7 +1680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
dependencies = [
"ring",
"untrusted 0.7.1",
"untrusted",
]
[[package]]
@ -1865,16 +1724,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "sct"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
"ring",
"untrusted 0.7.1",
]
[[package]]
name = "sct"
version = "0.7.0"
@ -1882,7 +1731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
"ring",
"untrusted 0.7.1",
"untrusted",
]
[[package]]
@ -2114,16 +1963,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tempdir"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
dependencies = [
"rand 0.4.6",
"remove_dir_all",
]
[[package]]
name = "tempfile"
version = "3.6.0"
@ -2138,25 +1977,6 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "termcolor"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
[[package]]
name = "test-cert-gen"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1847ff87195a089447cf1f2c8a21d232df9041cbe4abcf796aba1b69768c709a"
dependencies = [
"pem",
"tempdir",
]
[[package]]
name = "thiserror"
version = "1.0.41"
@ -2230,55 +2050,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tls-api"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0015c19a90afdc3ba506226988b039ee27763103651a3f125c2c7a76911c564"
dependencies = [
"anyhow",
"log",
"pem",
"tempdir",
"thiserror",
"tokio",
"void",
"webpki",
]
[[package]]
name = "tls-api-rustls"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7421b20bc881de94091b2a95249d956ee59c3909ecba5f4a4bf66883f659f4e"
dependencies = [
"anyhow",
"rustls 0.19.1",
"thiserror",
"tls-api",
"tls-api-test",
"tokio",
"webpki",
"webpki-roots 0.21.1",
]
[[package]]
name = "tls-api-test"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e415cc36b5fce7c9b5c0d7e6e018ed2ad07813e5aef77557a9aa71ec25ddfb7f"
dependencies = [
"anyhow",
"env_logger",
"log",
"pem",
"test-cert-gen",
"tls-api",
"tokio",
"untrusted 0.6.2",
"webpki",
]
[[package]]
name = "tokio"
version = "1.29.1"
@ -2324,7 +2095,7 @@ version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls 0.21.2",
"rustls",
"tokio",
]
@ -2362,7 +2133,7 @@ dependencies = [
"async-stream",
"async-trait",
"axum",
"base64 0.21.2",
"base64",
"bytes",
"flate2",
"futures-core",
@ -2383,7 +2154,7 @@ dependencies = [
"tower-layer",
"tower-service",
"tracing",
"webpki-roots 0.23.1",
"webpki-roots",
]
[[package]]
@ -2410,7 +2181,7 @@ dependencies = [
"indexmap",
"pin-project",
"pin-project-lite",
"rand 0.8.5",
"rand",
"slab",
"tokio",
"tokio-util",
@ -2512,12 +2283,6 @@ dependencies = [
"subtle",
]
[[package]]
name = "untrusted"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
[[package]]
name = "untrusted"
version = "0.7.1"
@ -2542,12 +2307,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "void"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]]
name = "want"
version = "0.3.1"
@ -2627,25 +2386,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "webpki"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
"ring",
"untrusted 0.7.1",
]
[[package]]
name = "webpki-roots"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
dependencies = [
"webpki",
]
[[package]]
name = "webpki-roots"
version = "0.23.1"
@ -2682,15 +2422,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
@ -2790,7 +2521,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a55db8d2cb4ca82a71fa66ccd9fa5b211f5ab90c866721311ddd85f8f90d0701"
dependencies = [
"base64 0.21.2",
"base64",
"bech32",
"bls12_381",
"bs58",
@ -2856,7 +2587,7 @@ dependencies = [
"chacha20",
"chacha20poly1305",
"cipher",
"rand_core 0.6.4",
"rand_core",
"subtle",
]
@ -2884,8 +2615,8 @@ dependencies = [
"memuse",
"nonempty",
"orchard",
"rand 0.8.5",
"rand_core 0.6.4",
"rand",
"rand_core",
"sha2 0.10.7",
"subtle",
"zcash_address",
@ -2906,7 +2637,7 @@ dependencies = [
"group",
"jubjub",
"lazy_static",
"rand_core 0.6.4",
"rand_core",
"redjubjub",
"tracing",
"zcash_primitives",
@ -2922,7 +2653,6 @@ dependencies = [
"prost",
"schemer",
"secrecy",
"tls-api-rustls",
"tokio",
"tonic",
"zcash_client_backend",

View File

@ -13,7 +13,6 @@ gumdrop = "0.8"
prost = "0.11"
schemer = "0.2"
secrecy = "0.8"
tls-api-rustls = "0.6"
tokio = { version = "1.21.0", features = ["fs", "macros", "rt-multi-thread"] }
tonic = { version = "0.9", features = ["gzip", "tls-webpki-roots"] }
zcash_client_backend = { version = "0.9", features = ["lightwalletd-tonic"] }