From f9fb3f69888257602aa45db06e4d44c1f90716e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Tue, 3 Oct 2023 11:25:10 +0200 Subject: [PATCH] Upgrade to latest sqlite everywhere --- Cargo.lock | 467 ++++++++++-------- Cargo.toml | 1 + common/client-core/Cargo.toml | 4 +- .../backend/fs_backend/manager.rs | 4 +- common/credential-storage/Cargo.toml | 4 +- .../src/persistent_storage.rs | 4 +- common/statistics/Cargo.toml | 2 +- ephemera/Cargo.toml | 2 +- gateway/Cargo.toml | 4 +- gateway/src/node/storage/mod.rs | 4 +- nym-api/Cargo.toml | 4 +- nym-api/src/support/storage/mod.rs | 4 +- .../network-requester/Cargo.toml | 2 +- .../network-statistics/Cargo.toml | 4 +- .../network-statistics/src/storage/mod.rs | 4 +- 15 files changed, 289 insertions(+), 225 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3361e5dc65..2aa02ca6d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -690,18 +690,9 @@ dependencies = [ [[package]] name = "atoi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -925,6 +916,9 @@ name = "bitflags" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -1834,30 +1828,15 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "crc" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" -dependencies = [ - "crc-catalog 1.1.1", -] - [[package]] name = "crc" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ - "crc-catalog 2.2.0", + "crc-catalog", ] -[[package]] -name = "crc-catalog" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" - [[package]] name = "crc-catalog" version = "2.2.0" @@ -2391,7 +2370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", - "pem-rfc7468", + "pem-rfc7468 0.6.0", "zeroize", ] @@ -2402,6 +2381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", + "pem-rfc7468 0.7.0", "zeroize", ] @@ -2639,12 +2619,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "dotenvy" version = "0.15.7" @@ -2763,6 +2737,9 @@ name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -2778,7 +2755,7 @@ dependencies = [ "generic-array 0.14.7", "group 0.12.1", "hkdf 0.12.3", - "pem-rfc7468", + "pem-rfc7468 0.6.0", "pkcs8 0.9.0", "rand_core 0.6.4", "sec1 0.3.0", @@ -2956,6 +2933,17 @@ dependencies = [ "libc", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -3181,13 +3169,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -3293,13 +3280,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot 0.12.1", ] [[package]] @@ -3648,15 +3635,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -3685,15 +3663,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "hashlink" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -dependencies = [ - "hashbrown 0.11.2", -] - [[package]] name = "hashlink" version = "0.8.3" @@ -3972,7 +3941,7 @@ dependencies = [ "hyper-rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.22.0", + "tokio-rustls", "tower-service", "webpki 0.21.4", ] @@ -3990,7 +3959,7 @@ dependencies = [ "rustls 0.19.1", "rustls-native-certs", "tokio", - "tokio-rustls 0.22.0", + "tokio-rustls", "webpki 0.21.4", "webpki-roots 0.21.1", ] @@ -4482,6 +4451,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lazycell" @@ -5329,9 +5301,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -5950,6 +5922,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -5971,6 +5960,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.16" @@ -6058,7 +6058,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sqlx 0.6.3", + "sqlx", "tap", "tempfile", "thiserror", @@ -6279,7 +6279,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.7", - "sqlx 0.6.3", + "sqlx", "tap", "tempfile", "thiserror", @@ -6414,7 +6414,7 @@ version = "0.1.0" dependencies = [ "async-trait", "log", - "sqlx 0.5.11", + "sqlx", "thiserror", "tokio", ] @@ -6582,7 +6582,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sqlx 0.5.11", + "sqlx", "subtle-encoding", "thiserror", "tokio", @@ -6870,7 +6870,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sqlx 0.6.3", + "sqlx", "tap", "tempfile", "thiserror", @@ -6891,7 +6891,7 @@ dependencies = [ "pretty_env_logger", "rocket", "serde", - "sqlx 0.5.11", + "sqlx", "thiserror", "tokio", ] @@ -7345,7 +7345,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sqlx 0.5.11", + "sqlx", "thiserror", "tokio", ] @@ -7980,6 +7980,15 @@ dependencies = [ "base64ct", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.0" @@ -8078,6 +8087,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der 0.7.8", + "pkcs8 0.10.2", + "spki 0.7.2", +] + [[package]] name = "pkcs8" version = "0.9.0" @@ -9097,6 +9117,28 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8 0.10.2", + "rand_core 0.6.4", + "signature 2.1.0", + "spki 0.7.2", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "rtcp" version = "0.7.2" @@ -9139,16 +9181,15 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "fallible-iterator", "fallible-streaming-iterator", - "hashlink 0.7.0", + "hashlink", "libsqlite3-sys", - "memchr", "smallvec", ] @@ -10031,17 +10072,6 @@ dependencies = [ "der 0.7.8", ] -[[package]] -name = "sqlformat" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - [[package]] name = "sqlformat" version = "0.2.1" @@ -10055,175 +10085,204 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc15591eb44ffb5816a4a70a7efd5dd87bfd3aa84c4c200401c4396140525826" -dependencies = [ - "sqlx-core 0.5.13", - "sqlx-macros 0.5.13", -] - -[[package]] -name = "sqlx" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ - "sqlx-core 0.6.3", - "sqlx-macros 0.6.3", + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.5.13" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ - "ahash 0.7.6", - "atoi 0.4.0", - "bitflags 1.3.2", + "ahash 0.8.3", + "atoi", "byteorder", "bytes", "chrono", - "crc 2.1.0", + "crc", "crossbeam-queue", + "dotenvy", "either", "event-listener", - "flume", "futures-channel", "futures-core", - "futures-executor", "futures-intrusive", + "futures-io", "futures-util", - "hashlink 0.7.0", + "hashlink", "hex", - "indexmap 1.9.3", - "itoa", - "libc", - "libsqlite3-sys", + "indexmap 2.0.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls 0.19.1", + "rustls 0.21.7", + "rustls-pemfile", + "serde", + "serde_json", "sha2 0.10.7", "smallvec", - "sqlformat 0.1.8", - "sqlx-rt 0.5.13", - "stringprep", + "sqlformat", "thiserror", + "tokio", "tokio-stream", + "tracing", "url", - "webpki 0.21.4", - "webpki-roots 0.21.1", + "webpki-roots 0.24.0", ] [[package]] -name = "sqlx-core" -version = "0.6.3" +name = "sqlx-macros" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ - "ahash 0.7.6", - "atoi 1.0.0", - "bitflags 1.3.2", - "byteorder", - "bytes", - "chrono", - "crc 3.0.1", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink 0.8.3", - "hex", - "indexmap 1.9.3", - "itoa", - "libc", - "libsqlite3-sys", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.20.8", - "rustls-pemfile", - "sha2 0.10.7", - "smallvec", - "sqlformat 0.2.1", - "sqlx-rt 0.6.3", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki-roots 0.22.6", + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", ] [[package]] -name = "sqlx-macros" -version = "0.5.13" +name = "sqlx-macros-core" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ - "dotenv", + "dotenvy", "either", "heck 0.4.1", + "hex", "once_cell", "proc-macro2", "quote", + "serde", + "serde_json", "sha2 0.10.7", - "sqlx-core 0.5.13", - "sqlx-rt 0.5.13", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.109", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-macros" -version = "0.6.3" +name = "sqlx-mysql" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ + "atoi", + "base64 0.21.4", + "bitflags 2.4.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", "dotenvy", "either", - "heck 0.4.1", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array 0.14.7", + "hex", + "hkdf 0.12.3", + "hmac 0.12.1", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "proc-macro2", - "quote", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", "sha2 0.10.7", - "sqlx-core 0.6.3", - "sqlx-rt 0.6.3", - "syn 1.0.109", - "url", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", ] [[package]] -name = "sqlx-rt" -version = "0.5.13" +name = "sqlx-postgres" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ + "atoi", + "base64 0.21.4", + "bitflags 2.4.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf 0.12.3", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls 0.22.0", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", ] [[package]] -name = "sqlx-rt" -version = "0.6.3" +name = "sqlx-sqlite" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.23.4", + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", ] [[package]] @@ -10324,7 +10383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" dependencies = [ "base64 0.13.1", - "crc 3.0.1", + "crc", "lazy_static", "md-5", "rand 0.8.5", @@ -10779,17 +10838,6 @@ dependencies = [ "webpki 0.21.4", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki 0.22.0", -] - [[package]] name = "tokio-socks" version = "0.5.1" @@ -11933,6 +11981,15 @@ dependencies = [ "rustls-webpki 0.100.2", ] +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki 0.101.4", +] + [[package]] name = "webrtc" version = "0.6.0" @@ -12038,7 +12095,7 @@ checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ "arc-swap", "async-trait", - "crc 3.0.1", + "crc", "log", "rand 0.8.5", "serde", @@ -12089,7 +12146,7 @@ dependencies = [ "arc-swap", "async-trait", "bytes", - "crc 3.0.1", + "crc", "log", "rand 0.8.5", "thiserror", @@ -12153,6 +12210,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + [[package]] name = "widestring" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 886b9a70f3..3578e48240 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -160,6 +160,7 @@ rand = "0.8.5" reqwest = "0.11.18" serde = "1.0.152" serde_json = "1.0.91" +sqlx = "0.7.2" tap = "1.0.1" tendermint-rpc = "0.32" # same version as used by cosmrs thiserror = "1.0.38" diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index a98eb783ab..37b6ccd34e 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -57,7 +57,7 @@ features = ["time"] version = "0.14" [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] -version = "0.6.2" +workspace = true features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] optional = true @@ -88,7 +88,7 @@ tempfile = "3.1.0" [build-dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } [features] default = [] diff --git a/common/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs b/common/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs index 40c4da18fa..1497bf2dff 100644 --- a/common/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs +++ b/common/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs @@ -30,11 +30,11 @@ impl StorageManager { })?; } - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) .create_if_missing(fresh); - opts.disable_statement_logging(); + let opts = opts.disable_statement_logging(); let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(pool) => pool, diff --git a/common/credential-storage/Cargo.toml b/common/credential-storage/Cargo.toml index f86d919197..87d54db211 100644 --- a/common/credential-storage/Cargo.toml +++ b/common/credential-storage/Cargo.toml @@ -13,7 +13,7 @@ thiserror = "1.0" tokio = { version = "1.24.1", features = ["sync"]} [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] -version = "0.5" +workspace = true features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio] @@ -22,5 +22,5 @@ features = [ "rt-multi-thread", "net", "signal", "fs" ] [build-dependencies] -sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] } diff --git a/common/credential-storage/src/persistent_storage.rs b/common/credential-storage/src/persistent_storage.rs index f214e40345..b8403db845 100644 --- a/common/credential-storage/src/persistent_storage.rs +++ b/common/credential-storage/src/persistent_storage.rs @@ -29,11 +29,11 @@ impl PersistentStorage { database_path.as_ref().as_os_str() ); - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) .create_if_missing(true); - opts.disable_statement_logging(); + let opts = opts.disable_statement_logging(); let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, diff --git a/common/statistics/Cargo.toml b/common/statistics/Cargo.toml index 1e762b88f1..25c7f7c2da 100644 --- a/common/statistics/Cargo.toml +++ b/common/statistics/Cargo.toml @@ -14,6 +14,6 @@ log = { workspace = true } reqwest = { workspace = true, features = ["json"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1" -sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "chrono"]} +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "chrono"]} thiserror = "1" tokio = { version = "1.24.1", features = [ "time" ] } diff --git a/ephemera/Cargo.toml b/ephemera/Cargo.toml index 50743df2fe..222085ec24 100644 --- a/ephemera/Cargo.toml +++ b/ephemera/Cargo.toml @@ -38,7 +38,7 @@ pretty_env_logger = "0.4" refinery = { version = "0.8.7", features = ["rusqlite"], optional = true } reqwest = { version = "0.11.6", features = ["json"] } rocksdb = { version = "0.21.0", optional = true } -rusqlite = { version = "0.27.0", features = ["bundled"], optional = true } +rusqlite = { version = "0.29.0", features = ["bundled"], optional = true } serde = { version = "1.0", features = ["derive"] } serde_derive = "1.0.149" serde_json = "1.0.91" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 2e4541e63b..5663288797 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -34,7 +34,7 @@ pretty_env_logger = "0.4" rand = "0.7" serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "sqlite", "macros", "migrate", ] } +sqlx = { workspace = true, features = [ "runtime-tokio-rustls", "sqlite", "macros", "migrate", ] } subtle-encoding = { version = "0.5", features = ["bech32-preview"] } thiserror = "1" tokio = { workspace = true, features = [ "rt-multi-thread", "net", "signal", "fs", "time" ] } @@ -66,7 +66,7 @@ nym-wireguard = { path = "../common/wireguard" } [build-dependencies] tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] } -sqlx = { version = "0.5", features = [ +sqlx = { workspace = true, features = [ "runtime-tokio-rustls", "sqlite", "macros", diff --git a/gateway/src/node/storage/mod.rs b/gateway/src/node/storage/mod.rs index e4ae31ca19..f2b831b253 100644 --- a/gateway/src/node/storage/mod.rs +++ b/gateway/src/node/storage/mod.rs @@ -162,13 +162,13 @@ impl PersistentStorage { // TODO: we can inject here more stuff based on our gateway global config // struct. Maybe different pool size or timeout intervals? - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) .create_if_missing(true); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); + let opts = opts.disable_statement_logging(); let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 5f5f6a9bd6..5632c043b5 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -52,7 +52,7 @@ ts-rs = { workspace = true, optional = true} anyhow = "1.0" getset = "0.1.1" -sqlx = { version = "0.6.2", features = [ +sqlx = { workspace = true, features = [ "runtime-tokio-rustls", "sqlite", "macros", @@ -113,7 +113,7 @@ generate-ts = ["ts-rs"] [build-dependencies] tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] } -sqlx = { version = "0.6.2", features = [ +sqlx = { workspace = true, features = [ "runtime-tokio-rustls", "sqlite", "macros", diff --git a/nym-api/src/support/storage/mod.rs b/nym-api/src/support/storage/mod.rs index c4f6d8e294..cab13db8e3 100644 --- a/nym-api/src/support/storage/mod.rs +++ b/nym-api/src/support/storage/mod.rs @@ -31,13 +31,13 @@ impl NymApiStorage { pub async fn init>(database_path: P) -> Result { // TODO: we can inject here more stuff based on our nym-api global config // struct. Maybe different pool size or timeout intervals? - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) .create_if_missing(true); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); + let opts = opts.disable_statement_logging(); let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 28fe7a0212..50ad94f938 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -31,7 +31,7 @@ regex = "1.8.4" reqwest = { workspace = true, features = ["json"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "chrono"]} +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "chrono"]} tap = { workspace = true } thiserror = "1.0" tokio = { version = "1.24.1", features = [ "net", "rt-multi-thread", "macros" ] } diff --git a/service-providers/network-statistics/Cargo.toml b/service-providers/network-statistics/Cargo.toml index 3c40a1ee53..1519a5b0e7 100644 --- a/service-providers/network-statistics/Cargo.toml +++ b/service-providers/network-statistics/Cargo.toml @@ -11,7 +11,7 @@ log = { workspace = true } pretty_env_logger = "0.4" rocket = { version = "0.5.0-rc.2", features = ["json"] } serde = { workspace = true, features = ["derive"] } -sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "chrono"]} +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "chrono"]} thiserror = "1" tokio = { version = "1.4", features = [ "net", "rt-multi-thread", "macros", "time" ] } nym-bin-common = { path = "../../common/bin-common"} @@ -19,5 +19,5 @@ nym-statistics-common = { path = "../../common/statistics" } nym-task = { path = "../../common/task" } [build-dependencies] -sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } tokio = { version = "1.4", features = ["rt-multi-thread", "macros"] } diff --git a/service-providers/network-statistics/src/storage/mod.rs b/service-providers/network-statistics/src/storage/mod.rs index f485b08145..8b31f45907 100644 --- a/service-providers/network-statistics/src/storage/mod.rs +++ b/service-providers/network-statistics/src/storage/mod.rs @@ -26,11 +26,11 @@ impl NetworkStatisticsStorage { pub async fn init(base_dir: &PathBuf) -> Result { std::fs::create_dir_all(base_dir)?; let database_path = base_dir.join("db.sqlite"); - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) .create_if_missing(true); - opts.disable_statement_logging(); + let opts = opts.disable_statement_logging(); let connection_pool = sqlx::SqlitePool::connect_with(opts).await?;