mirror/lighthouse-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/lighthouse-pulse.git synced 2024-12-21 19:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove serde derive references (#4830)

Browse Source 
* remove remaining uses of serde_derive

* fix lockfile

---------

Co-authored-by: João Oliveira <hello@jxs.pt>
This commit is contained in:
realbigsean 2023-10-11 13:01:30 -04:00 committed by GitHub
parent d9acee5a72
commit 4555e33048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
138 changed files with 250 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
Cargo.lock generated
View File

@ -53,7 +53,6 @@ dependencies = [
"regex",
"rpassword",
"serde",
"serde_derive",
"serde_yaml",
"slog",
"types",
@ -153,9 +152,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "1.1.1"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
@ -287,7 +286,7 @@ dependencies = [
"log",
"parking",
"polling",
"rustix 0.37.23",
"rustix 0.37.24",
"slab",
"socket2 0.4.9",
"waker-fn",
@ -310,7 +309,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -647,7 +646,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
"syn 2.0.37",
"syn 2.0.38",
"which",
]
@ -735,7 +734,6 @@ dependencies = [
"milagro_bls",
"rand",
"serde",
"serde_derive",
"tree_hash",
"zeroize",
]
@ -776,7 +774,6 @@ dependencies = [
"log",
"logging",
"serde",
"serde_derive",
"serde_json",
"serde_yaml",
"slog",
@ -829,9 +826,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
[[package]]
name = "byteorder"
version = "1.4.3"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
@ -917,9 +914,9 @@ dependencies = [
[[package]]
name = "cargo-platform"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
dependencies = [
"serde",
]
@ -1095,7 +1092,6 @@ dependencies = [
"parking_lot 0.12.1",
"sensitive_url",
"serde",
"serde_derive",
"serde_yaml",
"slasher",
"slasher_service",
@ -1345,9 +1341,9 @@ dependencies = [
[[package]]
name = "csv"
version = "1.2.2"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
dependencies = [
"csv-core",
"itoa",
@ -1357,9 +1353,9 @@ dependencies = [
[[package]]
name = "csv-core"
version = "0.1.10"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
dependencies = [
"memchr",
]
@ -1421,7 +1417,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1613,7 +1609,7 @@ checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1631,9 +1627,9 @@ dependencies = [
[[package]]
name = "diesel"
version = "2.1.2"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53c8a2cb22327206568569e5a45bb5a2c946455efdd76e24d15b7e82171af95e"
checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33"
dependencies = [
"bitflags 2.4.0",
"byteorder",
@ -1652,7 +1648,7 @@ dependencies = [
"diesel_table_macro_syntax",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1672,7 +1668,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5"
dependencies = [
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1787,7 +1783,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1822,7 +1818,7 @@ checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
dependencies = [
"der 0.7.8",
"digest 0.10.7",
"elliptic-curve 0.13.5",
"elliptic-curve 0.13.6",
"rfc6979 0.4.0",
"signature 2.1.0",
"spki 0.7.2",
@ -1848,7 +1844,7 @@ dependencies = [
"ed25519",
"rand_core 0.6.4",
"serde",
"sha2 0.10.7",
"sha2 0.10.8",
"zeroize",
]
@ -1874,7 +1870,6 @@ dependencies = [
"kzg",
"rayon",
"serde",
"serde_derive",
"serde_json",
"serde_repr",
"serde_yaml",
@ -1914,9 +1909,9 @@ dependencies = [
[[package]]
name = "elliptic-curve"
version = "0.13.5"
version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
dependencies = [
"base16ct 0.2.0",
"crypto-bigint 0.5.3",
@ -2006,7 +2001,6 @@ dependencies = [
"futures",
"logging",
"serde",
"serde_derive",
"slog",
"slog-async",
"slog-json",
@ -2034,25 +2028,14 @@ dependencies = [
[[package]]
name = "errno"
version = "0.3.3"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
"errno-dragonfly",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "errno-dragonfly"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "error-chain"
version = "0.12.4"
@ -2161,7 +2144,6 @@ dependencies = [
"lazy_static",
"num-bigint",
"serde",
"serde_derive",
"serde_yaml",
]
@ -2333,7 +2315,7 @@ dependencies = [
"impl-codec 0.6.0",
"impl-rlp",
"impl-serde 0.4.0",
"primitive-types 0.12.1",
"primitive-types 0.12.2",
"scale-info",
"uint",
]
@ -2347,7 +2329,7 @@ dependencies = [
"cpufeatures",
"lazy_static",
"ring",
"sha2 0.10.7",
"sha2 0.10.8",
]
[[package]]
@ -2866,7 +2848,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -3126,9 +3108,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.14.0"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
dependencies = [
"ahash 0.8.3",
"allocator-api2",
@ -3158,7 +3140,7 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
dependencies = [
"hashbrown 0.14.0",
"hashbrown 0.14.1",
]
[[package]]
@ -3633,12 +3615,12 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.0.0"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
"hashbrown 0.14.1",
]
[[package]]
@ -3757,9 +3739,9 @@ dependencies = [
[[package]]
name = "jobserver"
version = "0.1.26"
version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
dependencies = [
"libc",
]
@ -3796,7 +3778,7 @@ dependencies = [
"cfg-if",
"ecdsa 0.14.8",
"elliptic-curve 0.12.3",
"sha2 0.10.7",
"sha2 0.10.8",
"sha3 0.10.8",
]
@ -3808,9 +3790,9 @@ checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
dependencies = [
"cfg-if",
"ecdsa 0.16.8",
"elliptic-curve 0.13.5",
"elliptic-curve 0.13.6",
"once_cell",
"sha2 0.10.7",
"sha2 0.10.8",
"signature 2.1.0",
]
@ -3829,7 +3811,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c"
dependencies = [
"primitive-types 0.12.1",
"primitive-types 0.12.2",
"tiny-keccak",
]
@ -3930,9 +3912,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.148"
version = "0.2.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "libflate"
@ -3966,9 +3948,9 @@ dependencies = [
[[package]]
name = "libm"
version = "0.2.7"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libmdbx"
@ -4108,7 +4090,7 @@ dependencies = [
"quick-protobuf-codec",
"rand",
"regex",
"sha2 0.10.7",
"sha2 0.10.8",
"smallvec",
"unsigned-varint 0.7.2",
"void",
@ -4138,13 +4120,14 @@ dependencies = [
[[package]]
name = "libp2p-identity"
version = "0.2.3"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "686e73aff5e23efbb99bc85340ea6fd8686986aa7b283a881ba182cfca535ca9"
checksum = "57bf6e730ec5e7022958da53ffb03b326e681b7316939012ae9b3c7449a812d4"
dependencies = [
"asn1_der",
"bs58 0.5.0",
"ed25519-dalek",
"hkdf",
"libsecp256k1",
"log",
"multihash",
@ -4152,7 +4135,7 @@ dependencies = [
"quick-protobuf",
"rand",
"sec1 0.7.3",
"sha2 0.10.7",
"sha2 0.10.8",
"thiserror",
"void",
"zeroize",
@ -4231,7 +4214,7 @@ dependencies = [
"once_cell",
"quick-protobuf",
"rand",
"sha2 0.10.7",
"sha2 0.10.8",
"snow",
"static_assertions",
"thiserror",
@ -4280,9 +4263,9 @@ dependencies = [
[[package]]
name = "libp2p-swarm"
version = "0.43.4"
version = "0.43.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0cf749abdc5ca1dce6296dc8ea0f012464dfcfd3ddd67ffc0cabd8241c4e1da"
checksum = "ab94183f8fc2325817835b57946deb44340c99362cd4606c0a5717299b2ba369"
dependencies = [
"either",
"fnv",
@ -4311,7 +4294,7 @@ dependencies = [
"proc-macro-warning",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -4514,7 +4497,6 @@ dependencies = [
"rand",
"regex",
"serde",
"serde_derive",
"sha2 0.9.9",
"slog",
"slog-async",
@ -4567,9 +4549,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
version = "0.4.7"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "lmdb-rkv"
@ -4752,9 +4734,9 @@ checksum = "8c408dc227d302f1496c84d9dc68c00fec6f56f9228a18f3023f976f3ca7c945"
[[package]]
name = "memchr"
version = "2.6.3"
version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memoffset"
@ -4902,7 +4884,6 @@ dependencies = [
"reqwest",
"sensitive_url",
"serde",
"serde_derive",
"serde_json",
"slog",
"store",
@ -5242,9 +5223,9 @@ dependencies = [
[[package]]
name = "num-traits"
version = "0.2.16"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
]
@ -5359,7 +5340,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -5407,7 +5388,6 @@ dependencies = [
"rand",
"rayon",
"serde",
"serde_derive",
"state_processing",
"store",
"tokio",
@ -5427,9 +5407,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
dependencies = [
"ecdsa 0.16.8",
"elliptic-curve 0.13.5",
"elliptic-curve 0.13.6",
"primeorder",
"sha2 0.10.7",
"sha2 0.10.8",
]
[[package]]
@ -5573,7 +5553,7 @@ dependencies = [
"digest 0.10.7",
"hmac 0.12.1",
"password-hash",
"sha2 0.10.7",
"sha2 0.10.8",
]
[[package]]
@ -5651,7 +5631,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -5785,7 +5765,7 @@ dependencies = [
"md-5",
"memchr",
"rand",
"sha2 0.10.7",
"sha2 0.10.8",
"stringprep",
]
@ -5830,7 +5810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -5839,7 +5819,7 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
dependencies = [
"elliptic-curve 0.13.5",
"elliptic-curve 0.13.6",
]
[[package]]
@ -5857,9 +5837,9 @@ dependencies = [
[[package]]
name = "primitive-types"
version = "0.12.1"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
dependencies = [
"fixed-hash 0.8.0",
"impl-codec 0.6.0",
@ -5871,12 +5851,12 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
version = "1.1.3"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"thiserror",
"toml 0.5.11",
"once_cell",
"toml_edit",
]
[[package]]
@ -5917,14 +5897,14 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
name = "proc-macro2"
version = "1.0.67"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
@ -5979,7 +5959,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -5990,7 +5970,6 @@ dependencies = [
"ethereum_ssz_derive",
"safe_arith",
"serde",
"serde_derive",
"serde_yaml",
"superstruct",
"types",
@ -6272,14 +6251,14 @@ dependencies = [
[[package]]
name = "regex"
version = "1.9.5"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.3.8",
"regex-syntax 0.7.5",
"regex-automata 0.4.1",
"regex-syntax 0.8.1",
]
[[package]]
@ -6293,13 +6272,13 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.3.8"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax 0.7.5",
"regex-syntax 0.8.1",
]
[[package]]
@ -6310,15 +6289,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
version = "0.7.5"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
[[package]]
name = "reqwest"
version = "0.11.20"
version = "0.11.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
dependencies = [
"base64 0.21.4",
"bytes",
@ -6344,6 +6323,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
"system-configuration",
"tokio",
"tokio-native-tls",
"tokio-rustls",
@ -6522,9 +6502,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.37.23"
version = "0.37.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d"
dependencies = [
"bitflags 1.3.2",
"errno",
@ -6536,14 +6516,14 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.14"
version = "0.38.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
dependencies = [
"bitflags 2.4.0",
"errno",
"libc",
"linux-raw-sys 0.4.7",
"linux-raw-sys 0.4.10",
"windows-sys 0.48.0",
]
@ -6752,9 +6732,9 @@ dependencies = [
[[package]]
name = "semver"
version = "1.0.19"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
dependencies = [
"serde",
]
@ -6810,7 +6790,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -6842,7 +6822,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -6926,9 +6906,9 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.10.7"
version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
@ -6959,9 +6939,9 @@ dependencies = [
[[package]]
name = "sharded-slab"
version = "0.1.4"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
dependencies = [
"lazy_static",
]
@ -7069,7 +7049,6 @@ dependencies = [
"rayon",
"safe_arith",
"serde",
"serde_derive",
"slog",
"sloggers",
"strum",
@ -7109,7 +7088,6 @@ dependencies = [
"rayon",
"rusqlite",
"serde",
"serde_derive",
"serde_json",
"tempfile",
"types",
@ -7252,7 +7230,7 @@ dependencies = [
"rand_core 0.6.4",
"ring",
"rustc_version",
"sha2 0.10.7",
"sha2 0.10.8",
"subtle",
]
@ -7381,7 +7359,6 @@ dependencies = [
"lru 0.7.8",
"parking_lot 0.12.1",
"serde",
"serde_derive",
"slog",
"sloggers",
"state_processing",
@ -7477,9 +7454,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.37"
version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@ -7547,7 +7524,6 @@ dependencies = [
"lighthouse_network",
"parking_lot 0.12.1",
"serde",
"serde_derive",
"serde_json",
"sysinfo",
"types",
@ -7600,7 +7576,7 @@ dependencies = [
"cfg-if",
"fastrand 2.0.1",
"redox_syscall 0.3.5",
"rustix 0.38.14",
"rustix 0.38.18",
"windows-sys 0.48.0",
]
@ -7653,7 +7629,7 @@ dependencies = [
"rand",
"serde",
"serde_json",
"sha2 0.10.7",
"sha2 0.10.8",
]
[[package]]
@ -7667,22 +7643,22 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.48"
version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.48"
version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -7757,7 +7733,7 @@ dependencies = [
"pbkdf2 0.11.0",
"rand",
"rustc-hash",
"sha2 0.10.7",
"sha2 0.10.8",
"thiserror",
"unicode-normalization",
"wasm-bindgen",
@ -7800,9 +7776,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.32.0"
version = "1.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
dependencies = [
"backtrace",
"bytes",
@ -7834,7 +7810,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -7962,7 +7938,7 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.0.0",
"indexmap 2.0.2",
"serde",
"serde_spanned",
"toml_datetime",
@ -8018,7 +7994,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -8215,7 +8191,6 @@ dependencies = [
"rusqlite",
"safe_arith",
"serde",
"serde_derive",
"serde_json",
"serde_yaml",
"slog",
@ -8396,7 +8371,6 @@ dependencies = [
"safe_arith",
"sensitive_url",
"serde",
"serde_derive",
"serde_json",
"slashing_protection",
"slog",
@ -8515,8 +8489,8 @@ dependencies = [
[[package]]
name = "warp"
version = "0.3.5"
source = "git+https://github.com/seanmonstar/warp.git#5ad8a9cb155f6485d13d591a564d8c70053a388a"
version = "0.3.6"
source = "git+https://github.com/seanmonstar/warp.git#efe8548a19172e69918396d0fdbc369df9d0eb17"
dependencies = [
"bytes",
"futures-channel",
@ -8593,7 +8567,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
"wasm-bindgen-shared",
]
@ -8627,7 +8601,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -8752,7 +8726,7 @@ dependencies = [
"either",
"home",
"once_cell",
"rustix 0.38.14",
"rustix 0.38.18",
]
[[package]]
@ -9012,9 +8986,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
version = "0.5.15"
version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
dependencies = [
"memchr",
]
@ -9156,7 +9130,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -9200,11 +9174,10 @@ dependencies = [
[[package]]
name = "zstd-sys"
version = "2.0.8+zstd.1.5.5"
version = "2.0.9+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
dependencies = [
"cc",
"libc",
"pkg-config",
]

1
beacon_node/client/Cargo.toml
View File

@ -22,7 +22,6 @@ types = { workspace = true }
eth2_config = { workspace = true }
slot_clock = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
error-chain = { workspace = true }
slog = { workspace = true }
tokio = { workspace = true }

2
beacon_node/client/src/config.rs
View File

@ -5,7 +5,7 @@ use directory::DEFAULT_ROOT_DIR;
use environment::LoggerConfig;
use network::NetworkConfig;
use sensitive_url::SensitiveUrl;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::fs;
use std::path::PathBuf;
use std::time::Duration;

1
beacon_node/lighthouse_network/Cargo.toml
View File

@ -10,7 +10,6 @@ unsigned-varint = { version = "0.6", features = ["codec"] }
ssz_types = { workspace = true }
types = { workspace = true }
serde = { workspace = true }
serde_derive = "1"
ethereum_ssz = { workspace = true }
ethereum_ssz_derive = { workspace = true }
tree_hash = { workspace = true }

2
beacon_node/lighthouse_network/src/config.rs
View File

@ -8,7 +8,7 @@ use directory::{
use discv5::{Discv5Config, Discv5ConfigBuilder};
use libp2p::gossipsub;
use libp2p::Multiaddr;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use std::net::{Ipv4Addr, Ipv6Addr};
use std::num::NonZeroU16;

2
beacon_node/lighthouse_network/src/rpc/config.rs
View File

@ -6,7 +6,7 @@ use std::{
use super::{methods, rate_limiter::Quota, Protocol};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
/// Auxiliary struct to aid on configuration parsing.
///

2
beacon_node/lighthouse_network/src/rpc/rate_limiter.rs
View File

@ -2,7 +2,7 @@ use super::config::RateLimiterConfig;
use crate::rpc::Protocol;
use fnv::FnvHashMap;
use libp2p::PeerId;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::convert::TryInto;
use std::future::Future;
use std::hash::Hash;

2
beacon_node/lighthouse_network/src/types/topics.rs
View File

@ -1,5 +1,5 @@
use libp2p::gossipsub::{IdentTopic as Topic, TopicHash};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use strum::AsRefStr;
use types::consts::deneb::BLOB_SIDECAR_SUBNET_COUNT;
use types::{EthSpec, ForkName, SubnetId, SyncSubnetId};

1
beacon_node/operation_pool/Cargo.toml
View File

@ -16,7 +16,6 @@ ethereum_ssz = { workspace = true }
ethereum_ssz_derive = { workspace = true }
rayon = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
store = { workspace = true }
bitvec = { workspace = true }
rand = { workspace = true }

2
beacon_node/operation_pool/src/attestation_id.rs
View File

@ -1,4 +1,4 @@
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
/// Serialized `AttestationData` augmented with a domain to encode the fork info.

2
beacon_node/operation_pool/src/sync_aggregate_id.rs
View File

@ -1,4 +1,4 @@
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use types::{Hash256, Slot};

1
beacon_node/store/Cargo.toml
View File

@ -19,7 +19,6 @@ types = { workspace = true }
state_processing = { workspace = true }
slog = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
lazy_static = { workspace = true }
lighthouse_metrics = { workspace = true }
lru = { workspace = true }

2
beacon_node/store/src/config.rs
View File

@ -1,5 +1,5 @@
use crate::{DBColumn, Error, StoreItem};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
use types::{EthSpec, MinimalEthSpec};

2
beacon_node/store/src/hot_cold_store.rs
View File

@ -25,7 +25,7 @@ use itertools::process_results;
use leveldb::iterator::LevelDBIterator;
use lru::LruCache;
use parking_lot::{Mutex, RwLock};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use slog::{debug, error, info, trace, warn, Logger};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};

2
beacon_node/store/src/metadata.rs
View File

@ -1,5 +1,5 @@
use crate::{DBColumn, Error, StoreItem};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
use types::{Checkpoint, Hash256, Slot};

1
boot_node/Cargo.toml
View File

@ -21,7 +21,6 @@ slog-scope = "4.3.0"
slog-stdlog = "4.0.0"
hex = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
serde_json = { workspace = true }
serde_yaml = { workspace = true }
eth2_network_config = { workspace = true }

2
boot_node/src/config.rs
View File

@ -7,7 +7,7 @@ use lighthouse_network::{
discovery::{load_enr_from_disk, use_or_load_enr},
load_private_key, CombinedKeyExt, NetworkConfig,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::Encode;
use std::net::{SocketAddrV4, SocketAddrV6};
use std::time::Duration;

1
common/account_utils/Cargo.toml
View File

@ -13,7 +13,6 @@ eth2_keystore = { workspace = true }
filesystem = { workspace = true }
zeroize = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
serde_yaml = { workspace = true }
slog = { workspace = true }
types = { workspace = true }

2
common/account_utils/src/lib.rs
View File

@ -8,7 +8,7 @@ use eth2_wallet::{
};
use filesystem::{create_with_600_perms, Error as FsError};
use rand::{distributions::Alphanumeric, Rng};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::fs::{self, File};
use std::io;
use std::io::prelude::*;

2
common/account_utils/src/validator_definitions.rs
View File

@ -9,7 +9,7 @@ use crate::{
use directory::ensure_dir_exists;
use eth2_keystore::Keystore;
use regex::Regex;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use slog::{error, Logger};
use std::collections::HashSet;
use std::fs::{self, File};

1
common/eth2_interop_keypairs/Cargo.toml
View File

@ -13,7 +13,6 @@ ethereum_hashing = { workspace = true }
hex = { workspace = true }
serde_yaml = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
bls = { workspace = true }
[dev-dependencies]

2
common/eth2_interop_keypairs/src/lib.rs
View File

@ -22,7 +22,7 @@ extern crate lazy_static;
use bls::{Keypair, PublicKey, SecretKey};
use ethereum_hashing::hash;
use num_bigint::BigUint;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::convert::TryInto;
use std::fs::File;
use std::path::PathBuf;

1
common/monitoring_api/Cargo.toml
View File

@ -12,7 +12,6 @@ task_executor = { workspace = true }
tokio = { workspace = true }
eth2 = { workspace = true }
serde_json = { workspace = true }
serde_derive = "1.0.116"
serde = { workspace = true }
lighthouse_version = { workspace = true }
lighthouse_metrics = { workspace = true }

2
common/monitoring_api/src/types.rs
View File

@ -1,7 +1,7 @@
use std::time::{SystemTime, UNIX_EPOCH};
use eth2::lighthouse::{ProcessHealth, SystemHealth};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
pub const VERSION: u64 = 1;
pub const CLIENT_NAME: &str = "lighthouse";

1
common/system_health/Cargo.toml
View File

@ -8,6 +8,5 @@ lighthouse_network = { workspace = true }
types = { workspace = true }
sysinfo = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
serde_json = { workspace = true }
parking_lot = { workspace = true }

3
consensus/proto_array/Cargo.toml
View File

@ -13,7 +13,6 @@ types = { workspace = true }
ethereum_ssz = { workspace = true }
ethereum_ssz_derive = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
serde_yaml = { workspace = true }
safe_arith = { workspace = true }
superstruct = { workspace = true }
superstruct = { workspace = true }

2
consensus/proto_array/src/fork_choice_test_definition.rs
View File

@ -5,7 +5,7 @@ mod votes;
use crate::proto_array_fork_choice::{Block, ExecutionStatus, ProtoArrayForkChoice};
use crate::{InvalidationOperation, JustifiedBalances};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::collections::BTreeSet;
use types::{
AttestationShufflingId, Checkpoint, Epoch, EthSpec, ExecutionBlockHash, Hash256,

2
consensus/proto_array/src/proto_array.rs
View File

@ -1,6 +1,6 @@
use crate::error::InvalidBestNodeInfo;
use crate::{error::Error, Block, ExecutionStatus, JustifiedBalances};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::four_byte_option_impl;
use ssz::Encode;
use ssz_derive::{Decode, Encode};

2
consensus/proto_array/src/proto_array_fork_choice.rs
View File

@ -7,7 +7,7 @@ use crate::{
ssz_container::SszContainer,
JustifiedBalances,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
use std::{

1
consensus/types/Cargo.toml
View File

@ -24,7 +24,6 @@ rayon = { workspace = true }
rand = { workspace = true }
safe_arith = { workspace = true }
serde = { workspace = true, features = ["rc"] }
serde_derive = "1.0.116"
slog = { workspace = true }
ethereum_ssz = { workspace = true, features = ["arbitrary"] }
ethereum_ssz_derive = { workspace = true }

2
consensus/types/src/aggregate_and_proof.rs
View File

@ -3,7 +3,7 @@ use super::{
Signature, SignedRoot,
};
use crate::test_utils::TestRandom;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/attestation.rs
View File

@ -1,6 +1,6 @@
use derivative::Derivative;
use safe_arith::ArithError;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/attestation_data.rs
View File

@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
use crate::{Checkpoint, Hash256, SignedRoot, Slot};
use crate::slot_data::SlotData;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/attestation_duty.rs
View File

@ -1,5 +1,5 @@
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
#[derive(arbitrary::Arbitrary, Debug, PartialEq, Clone, Copy, Default, Serialize, Deserialize)]
pub struct AttestationDuty {

2
consensus/types/src/attester_slashing.rs
View File

@ -1,7 +1,7 @@
use crate::{test_utils::TestRandom, EthSpec, IndexedAttestation};
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/beacon_block.rs
View File

@ -6,7 +6,7 @@ use crate::test_utils::TestRandom;
use crate::*;
use bls::Signature;
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, DecodeError};
use ssz_derive::{Decode, Encode};
use std::marker::PhantomData;

2
consensus/types/src/beacon_block_body.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::*;
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use ssz_types::VariableList;
use std::marker::PhantomData;

2
consensus/types/src/beacon_block_header.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash::TreeHash;

2
consensus/types/src/beacon_state.rs
View File

@ -9,7 +9,7 @@ use ethereum_hashing::hash;
use int_to_bytes::{int_to_bytes4, int_to_bytes8};
use pubkey_cache::PubkeyCache;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{ssz_encode, Decode, DecodeError, Encode};
use ssz_derive::{Decode, Encode};
use ssz_types::{typenum::Unsigned, BitVector, FixedVector};

2
consensus/types/src/beacon_state/committee_cache.rs
View File

@ -4,7 +4,7 @@ use super::BeaconState;
use crate::*;
use core::num::NonZeroUsize;
use safe_arith::SafeArith;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{four_byte_option_impl, Decode, DecodeError, Encode};
use ssz_derive::{Decode, Encode};
use std::ops::Range;

2
consensus/types/src/beacon_state/exit_cache.rs
View File

@ -1,6 +1,6 @@
use super::{BeaconStateError, ChainSpec, Epoch, Validator};
use safe_arith::SafeArith;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
/// Map from exit epoch to the number of validators with that exit epoch.

2
consensus/types/src/beacon_state/progressive_balances_cache.rs
View File

@ -2,7 +2,7 @@ use crate::beacon_state::balance::Balance;
use crate::{BeaconState, BeaconStateError, ChainSpec, Epoch, EthSpec};
use arbitrary::Arbitrary;
use safe_arith::SafeArith;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use strum::{Display, EnumString, EnumVariantNames};
/// This cache keeps track of the accumulated target attestation balance for the current & previous

2
consensus/types/src/beacon_state/pubkey_cache.rs
View File

@ -1,5 +1,5 @@
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
type ValidatorIndex = usize;

2
consensus/types/src/blob_sidecar.rs
View File

@ -3,7 +3,7 @@ use crate::{Blob, EthSpec, Hash256, SignedRoot, Slot};
use derivative::Derivative;
use kzg::{Kzg, KzgCommitment, KzgPreset, KzgProof, BYTES_PER_FIELD_ELEMENT};
use rand::Rng;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::Encode;
use ssz_derive::{Decode, Encode};
use ssz_types::{FixedVector, VariableList};

2
consensus/types/src/bls_to_execution_change.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::*;
use bls::PublicKeyBytes;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

3
consensus/types/src/builder_bid.rs
View File

@ -6,8 +6,7 @@ use crate::{
};
use bls::PublicKeyBytes;
use bls::Signature;
use serde::Deserializer;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Deserializer, Serialize};
use ssz_derive::Encode;
use superstruct::superstruct;
use tree_hash_derive::TreeHash;

2
consensus/types/src/chain_spec.rs
View File

@ -1,8 +1,8 @@
use crate::application_domain::{ApplicationDomain, APPLICATION_DOMAIN_BUILDER};
use crate::*;
use int_to_bytes::int_to_bytes4;
use serde::Deserialize;
use serde::{Deserializer, Serialize, Serializer};
use serde_derive::Deserialize;
use serde_utils::quoted_u64::MaybeQuoted;
use std::fs::File;
use std::path::Path;

2
consensus/types/src/checkpoint.rs
View File

@ -1,6 +1,6 @@
use crate::test_utils::TestRandom;
use crate::{Epoch, Hash256};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/config_and_preset.rs
View File

@ -3,7 +3,7 @@ use crate::{
DenebPreset, EthSpec, ForkName,
};
use maplit::hashmap;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::collections::HashMap;
use superstruct::superstruct;

2
consensus/types/src/contribution_and_proof.rs
View File

@ -3,7 +3,7 @@ use super::{
SyncSelectionProof,
};
use crate::test_utils::TestRandom;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/deposit.rs
View File

@ -1,6 +1,6 @@
use crate::test_utils::TestRandom;
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use ssz_types::typenum::U33;
use test_random_derive::TestRandom;

2
consensus/types/src/deposit_data.rs
View File

@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
use crate::*;
use bls::{PublicKeyBytes, SignatureBytes};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/deposit_message.rs
View File

@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
use crate::*;
use bls::PublicKeyBytes;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/deposit_tree_snapshot.rs
View File

@ -1,7 +1,7 @@
use crate::*;
use ethereum_hashing::{hash32_concat, ZERO_HASHES};
use int_to_bytes::int_to_bytes32;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use test_utils::TestRandom;

2
consensus/types/src/enr_fork_id.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::Epoch;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/eth1_data.rs
View File

@ -1,7 +1,7 @@
use super::Hash256;
use crate::test_utils::TestRandom;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/eth_spec.rs
View File

@ -2,7 +2,7 @@ use crate::*;
use kzg::{BlobTrait, KzgPreset, MainnetKzgPreset, MinimalKzgPreset};
use safe_arith::SafeArith;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_types::typenum::{
bit::B0, UInt, Unsigned, U0, U1024, U1048576, U1073741824, U1099511627776, U128, U131072, U16,
U16777216, U2, U2048, U256, U32, U4, U4096, U512, U6, U625, U64, U65536, U8, U8192,

2
consensus/types/src/execution_block_hash.rs
View File

@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
use crate::Hash256;
use derivative::Derivative;
use rand::RngCore;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, DecodeError, Encode};
use std::fmt;

2
consensus/types/src/execution_payload.rs
View File

@ -1,6 +1,6 @@
use crate::{test_utils::TestRandom, *};
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;

2
consensus/types/src/execution_payload_header.rs
View File

@ -1,6 +1,6 @@
use crate::{test_utils::TestRandom, *};
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::Decode;
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;

2
consensus/types/src/fork.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::Epoch;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/fork_data.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::{Hash256, SignedRoot};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/fork_name.rs
View File

@ -1,5 +1,5 @@
use crate::{ChainSpec, Epoch};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use std::convert::TryFrom;
use std::fmt::{self, Display, Formatter};

2
consensus/types/src/historical_batch.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use ssz_types::FixedVector;
use test_random_derive::TestRandom;

2
consensus/types/src/historical_summary.rs
View File

@ -4,7 +4,7 @@ use crate::{BeaconState, EthSpec, Hash256};
use cached_tree_hash::Error;
use cached_tree_hash::{int_log, CacheArena, CachedTreeHash, TreeHashCache};
use compare_fields_derive::CompareFields;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use ssz_types::VariableList;
use test_random_derive::TestRandom;

2
consensus/types/src/indexed_attestation.rs
View File

@ -1,6 +1,6 @@
use crate::{test_utils::TestRandom, AggregateSignature, AttestationData, EthSpec, VariableList};
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::Encode;
use ssz_derive::{Decode, Encode};
use std::hash::{Hash, Hasher};

2
consensus/types/src/light_client_bootstrap.rs
View File

@ -1,6 +1,6 @@
use super::{BeaconBlockHeader, BeaconState, EthSpec, FixedVector, Hash256, SyncCommittee};
use crate::{light_client_update::*, test_utils::TestRandom};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use std::sync::Arc;
use test_random_derive::TestRandom;

2
consensus/types/src/light_client_finality_update.rs
View File

@ -3,7 +3,7 @@ use super::{
Slot, SyncAggregate,
};
use crate::{light_client_update::*, test_utils::TestRandom, BeaconState, ChainSpec};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash::TreeHash;

2
consensus/types/src/light_client_optimistic_update.rs
View File

@ -2,7 +2,7 @@ use super::{BeaconBlockHeader, EthSpec, Slot, SyncAggregate};
use crate::{
light_client_update::Error, test_utils::TestRandom, BeaconState, ChainSpec, SignedBeaconBlock,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash::TreeHash;

2
consensus/types/src/light_client_update.rs
View File

@ -1,7 +1,7 @@
use super::{BeaconBlockHeader, EthSpec, FixedVector, Hash256, Slot, SyncAggregate, SyncCommittee};
use crate::{beacon_state, test_utils::TestRandom, BeaconBlock, BeaconState, ChainSpec};
use safe_arith::ArithError;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use ssz_types::typenum::{U5, U6};
use std::sync::Arc;

2
consensus/types/src/participation_flags.rs
View File

@ -1,6 +1,6 @@
use crate::{consts::altair::NUM_FLAG_INDICES, test_utils::TestRandom, Hash256};
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, DecodeError, Encode};
use test_random_derive::TestRandom;
use tree_hash::{PackedEncoding, TreeHash, TreeHashType};

2
consensus/types/src/pending_attestation.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::{AttestationData, BitList, EthSpec};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/preset.rs
View File

@ -1,5 +1,5 @@
use crate::{ChainSpec, Epoch, EthSpec, Unsigned};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
/// Value-level representation of an Ethereum consensus "preset".
///

2
consensus/types/src/proposer_slashing.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::SignedBeaconBlockHeader;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/shuffling_id.rs
View File

@ -1,5 +1,5 @@
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use std::hash::Hash;

2
consensus/types/src/signed_aggregate_and_proof.rs
View File

@ -3,7 +3,7 @@ use super::{
SelectionProof, Signature, SignedRoot,
};
use crate::test_utils::TestRandom;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/signed_beacon_block.rs
View File

@ -1,7 +1,7 @@
use crate::*;
use bls::Signature;
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use std::fmt;
use superstruct::superstruct;

2
consensus/types/src/signed_beacon_block_header.rs
View File

@ -2,7 +2,7 @@ use crate::{
test_utils::TestRandom, BeaconBlockHeader, ChainSpec, Domain, EthSpec, Fork, Hash256,
PublicKey, Signature, SignedRoot,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/signed_blob.rs
View File

@ -5,7 +5,7 @@ use crate::{
};
use bls::PublicKey;
use derivative::Derivative;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use ssz_types::VariableList;
use std::marker::PhantomData;

2
consensus/types/src/signed_bls_to_execution_change.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::*;
use bls::Signature;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/signed_contribution_and_proof.rs
View File

@ -3,7 +3,7 @@ use super::{
SignedRoot, SyncCommitteeContribution, SyncSelectionProof,
};
use crate::test_utils::TestRandom;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/signed_voluntary_exit.rs
View File

@ -1,7 +1,7 @@
use crate::{test_utils::TestRandom, VoluntaryExit};
use bls::Signature;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/signing_data.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::Hash256;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash::TreeHash;

2
consensus/types/src/slot_epoch.rs
View File

@ -15,7 +15,7 @@ use crate::{ChainSpec, SignedRoot};
use rand::RngCore;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, DecodeError, Encode};
use std::fmt;
use std::hash::Hash;

2
consensus/types/src/subnet_id.rs
View File

@ -1,7 +1,7 @@
//! Identifies each shard by an integer identifier.
use crate::{AttestationData, ChainSpec, CommitteeIndex, Epoch, EthSpec, Slot};
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::ops::{Deref, DerefMut};
use swap_or_not_shuffle::compute_shuffled_index;

2
consensus/types/src/sync_aggregate.rs
View File

@ -3,7 +3,7 @@ use crate::test_utils::TestRandom;
use crate::{AggregateSignature, BitVector, EthSpec, SyncCommitteeContribution};
use derivative::Derivative;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/sync_aggregator_selection_data.rs
View File

@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::{SignedRoot, Slot};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/sync_committee.rs
View File

@ -3,7 +3,7 @@ use crate::typenum::Unsigned;
use crate::{EthSpec, FixedVector, SyncSubnetId};
use bls::PublicKeyBytes;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use std::collections::HashMap;
use test_random_derive::TestRandom;

2
consensus/types/src/sync_committee_contribution.rs
View File

@ -2,7 +2,7 @@ use super::{AggregateSignature, EthSpec, SignedRoot};
use crate::slot_data::SlotData;
use crate::{test_utils::TestRandom, BitVector, Hash256, Slot, SyncCommitteeMessage};
use safe_arith::ArithError;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/sync_committee_message.rs
View File

@ -2,7 +2,7 @@ use crate::test_utils::TestRandom;
use crate::{ChainSpec, Domain, EthSpec, Fork, Hash256, SecretKey, Signature, SignedRoot, Slot};
use crate::slot_data::SlotData;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/sync_duty.rs
View File

@ -1,7 +1,7 @@
use crate::{EthSpec, SyncCommittee, SyncSubnetId};
use bls::PublicKeyBytes;
use safe_arith::ArithError;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::collections::HashSet;
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

2
consensus/types/src/sync_subnet_id.rs
View File

@ -2,7 +2,7 @@
use crate::consts::altair::SYNC_COMMITTEE_SUBNET_COUNT;
use crate::EthSpec;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_types::typenum::Unsigned;
use std::collections::HashSet;
use std::fmt::{self, Display};

2
consensus/types/src/validator.rs
View File

@ -2,7 +2,7 @@ use crate::{
test_utils::TestRandom, Address, BeaconState, ChainSpec, Epoch, EthSpec, Hash256,
PublicKeyBytes,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/voluntary_exit.rs
View File

@ -3,7 +3,7 @@ use crate::{
SignedVoluntaryExit,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

2
consensus/types/src/withdrawal.rs
View File

@ -1,6 +1,6 @@
use crate::test_utils::TestRandom;
use crate::*;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

1
crypto/bls/Cargo.toml
View File

@ -10,7 +10,6 @@ tree_hash = { workspace = true }
milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.5.1", optional = true }
rand = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
ethereum_serde_utils = { workspace = true }
hex = { workspace = true }
ethereum_hashing = { workspace = true }

2
crypto/bls/src/zeroize_hash.rs
View File

@ -1,5 +1,5 @@
use super::SECRET_KEY_BYTES_LEN;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use zeroize::Zeroize;
/// Provides a wrapper around a `[u8; SECRET_KEY_BYTES_LEN]` that implements `Zeroize` on `Drop`.

2
crypto/kzg/src/lib.rs
View File

@ -2,7 +2,7 @@ mod kzg_commitment;
mod kzg_proof;
mod trusted_setup;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::fmt::Debug;
use std::ops::Deref;
use std::str::FromStr;

1
lighthouse/environment/Cargo.toml
View File

@ -19,7 +19,6 @@ futures = { workspace = true }
slog-json = "2.3.0"
exit-future = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
[target.'cfg(not(target_family = "unix"))'.dependencies]
ctrlc = { version = "3.1.6", features = ["termination"] }

2
lighthouse/environment/src/lib.rs
View File

@ -13,7 +13,7 @@ use futures::channel::mpsc::{channel, Receiver, Sender};
use futures::{future, StreamExt};
use logging::SSELoggingComponents;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use slog::{error, info, o, warn, Drain, Duplicate, Level, Logger};
use sloggers::{file::FileLoggerBuilder, types::Format, types::Severity, Build};
use std::fs::create_dir_all;

Some files were not shown because too many files have changed in this diff Show More