diff --git a/Cargo.lock b/Cargo.lock index d71390cfbb6..3ddff1c4276 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -291,42 +291,38 @@ dependencies = [ [[package]] name = "bollard" -version = "0.10.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699194c00f3a2effd3358d47f880646818e3d483190b17ebcdf598c654fb77e9" +checksum = "d82e7850583ead5f8bbef247e2a3c37a19bd576e8420cd262a6711921827e1e5" dependencies = [ "base64 0.13.0", "bollard-stubs", "bytes 1.0.1", - "chrono", - "ct-logs", - "dirs-next", "futures-core", "futures-util", "hex", "http 0.2.3", "hyper 0.14.5", - "hyper-unix-connector", + "hyperlocal", "log 0.4.11", - "pin-project 1.0.5", + "pin-project-lite 0.2.9", "serde", "serde_derive", "serde_json", "serde_urlencoded", "thiserror", - "tokio 1.4.0", - "tokio-util 0.6.3", + "tokio 1.19.2", + "tokio-util 0.7.3", "url 2.2.1", "winapi 0.3.9", ] [[package]] name = "bollard-stubs" -version = "1.41.0" +version = "1.42.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" +checksum = "ed59b5c00048f48d7af971b71f800fdf23e858844a6f9e4d32ca72e9399e7864" dependencies = [ - "chrono", "serde", "serde_with", ] @@ -423,7 +419,6 @@ dependencies = [ "libc", "num-integer", "num-traits", - "serde", "time", "winapi 0.3.9", ] @@ -791,15 +786,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct", -] - [[package]] name = "ctor" version = "0.1.16" @@ -1448,7 +1434,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.9", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1911,7 +1897,7 @@ dependencies = [ "futures 0.3.13", "lazy_static", "port_check", - "tokio 1.4.0", + "tokio 1.19.2", "tokio-stream", ] @@ -1976,7 +1962,7 @@ dependencies = [ "http 0.2.3", "indexmap", "slab 0.4.2", - "tokio 1.4.0", + "tokio 1.19.2", "tokio-util 0.6.3", "tracing", ] @@ -2198,8 +2184,8 @@ dependencies = [ "httpdate", "itoa", "pin-project 1.0.5", - "socket2 0.4.0", - "tokio 1.4.0", + "socket2 0.4.4", + "tokio 1.19.2", "tower-service", "tracing", "want 0.3.0", @@ -2232,16 +2218,16 @@ dependencies = [ ] [[package]] -name = "hyper-unix-connector" -version = "0.2.2" +name = "hyperlocal" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ef1fd95d34b4ff007d3f0590727b5cf33572cace09b42032fc817dc8b16557" +checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ - "anyhow", + "futures-util", "hex", "hyper 0.14.5", "pin-project 1.0.5", - "tokio 1.4.0", + "tokio 1.19.2", ] [[package]] @@ -2474,9 +2460,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.88" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "linked-hash-map" @@ -2663,7 +2649,7 @@ dependencies = [ "kernel32-sys", "libc", "log 0.4.11", - "miow 0.2.2", + "miow", "net2", "slab 0.4.2", "winapi 0.2.8", @@ -2671,15 +2657,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.9" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log 0.4.11", - "miow 0.3.6", - "ntapi", - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -2705,16 +2690,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" -dependencies = [ - "socket2 0.3.16", - "winapi 0.3.9", -] - [[package]] name = "mockall" version = "0.8.3" @@ -2822,15 +2797,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -3146,9 +3112,9 @@ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -3178,7 +3144,7 @@ dependencies = [ "fallible-iterator 0.2.0", "futures 0.3.13", "log 0.4.11", - "tokio 1.4.0", + "tokio 1.19.2", "tokio-postgres", ] @@ -3758,7 +3724,7 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding 2.1.0", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.9", "serde", "serde_json", "serde_urlencoded", @@ -3771,21 +3737,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "rlp" version = "0.4.6" @@ -3906,16 +3857,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "sct" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secp256k1" version = "0.20.1" @@ -4227,20 +4168,14 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi 0.3.9", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "stable-hash" version = "0.3.1" @@ -4591,20 +4526,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.4.0" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ - "autocfg 1.0.1", "bytes 1.0.1", "libc", "memchr", - "mio 0.7.9", + "mio 0.8.4", "num_cpus", "once_cell", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.9", "signal-hook-registry", - "tokio-macros 1.1.0", + "socket2 0.4.4", + "tokio-macros 1.8.0", "winapi 0.3.9", ] @@ -4704,9 +4639,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.1.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -4728,11 +4663,11 @@ dependencies = [ "parking_lot 0.11.1", "percent-encoding 2.1.0", "phf", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.9", "postgres-protocol", "postgres-types", - "socket2 0.4.0", - "tokio 1.4.0", + "socket2 0.4.4", + "tokio 1.19.2", "tokio-util 0.6.3", ] @@ -4773,8 +4708,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" dependencies = [ "futures-core", - "pin-project-lite 0.2.6", - "tokio 1.4.0", + "pin-project-lite 0.2.9", + "tokio 1.19.2", "tokio-util 0.6.3", ] @@ -4949,8 +4884,22 @@ dependencies = [ "futures-core", "futures-sink", "log 0.4.11", - "pin-project-lite 0.2.6", - "tokio 1.4.0", + "pin-project-lite 0.2.9", + "tokio 1.19.2", +] + +[[package]] +name = "tokio-util" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.9", + "tokio 1.19.2", + "tracing", ] [[package]] @@ -4970,21 +4919,21 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.21" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "log 0.4.11", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.9", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", ] @@ -5129,12 +5078,6 @@ dependencies = [ "void", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "1.7.2" @@ -5256,6 +5199,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.68" @@ -5661,6 +5610,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.7.0" diff --git a/tests/Cargo.toml b/tests/Cargo.toml index f3a83bd8012..43f16c99fb4 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -4,7 +4,7 @@ version = "0.23.1" edition = "2018" [dev-dependencies] -bollard = "0.10" +bollard = "0.13" tokio = {version = "1.2.0", features = ["rt", "macros", "process"]} tokio-stream = "0.1" futures = "0.3.13"