diff --git a/Cargo.lock b/Cargo.lock index d71390cfbb6..56bf0980020 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,9 +113,9 @@ version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -807,7 +807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484" dependencies = [ "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -851,10 +851,10 @@ checksum = "b443e5fb0ddd56e0c9bfa47dc060c5306ee500cb731f2b91432dd65589a77684" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", "strsim 0.10.0", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -876,7 +876,7 @@ checksum = "c0220073ce504f12a70efc4e7cdaea9e9b1b324872e7ad96a208056d7a638b81" dependencies = [ "darling_core 0.12.2", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -892,9 +892,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320" dependencies = [ "convert_case", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -937,9 +937,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70806b70be328e646f243680a3fc93b3cfdd6db373faa5110660a5dd5af243bc" dependencies = [ "heck", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -956,9 +956,9 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -983,6 +983,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.8.1" @@ -1055,9 +1061,9 @@ dependencies = [ [[package]] name = "downcast" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dtoa" @@ -1214,9 +1220,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", "synstructure", ] @@ -1280,9 +1286,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "float-cmp" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ "num-traits", ] @@ -1417,9 +1423,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -1537,9 +1543,9 @@ checksum = "45ceded7b01141664c3fc4a50199c408a6ed247e6c8415dc005e895f1d233374" dependencies = [ "chrono", "log 0.4.11", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -1584,7 +1590,7 @@ dependencies = [ "isatty", "lazy_static", "maplit", - "mockall 0.8.3", + "mockall", "num-bigint", "num-traits", "num_cpus", @@ -1645,7 +1651,7 @@ dependencies = [ "http 0.1.21", "jsonrpc-core", "lazy_static", - "mockall 0.9.1", + "mockall", "pretty_assertions", "serde", "state_machine_future", @@ -1711,7 +1717,7 @@ dependencies = [ "graph", "graph-graphql", "graphql-parser", - "mockall 0.8.3", + "mockall", "rand 0.6.5", ] @@ -1757,7 +1763,7 @@ version = "0.23.1" dependencies = [ "anyhow", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -2610,9 +2616,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" dependencies = [ "migrations_internals", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -2717,56 +2723,29 @@ dependencies = [ [[package]] name = "mockall" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cabea45a7fc0e37093f4f30a5e2b62602253f91791c057d5f0470c63260c3d" -dependencies = [ - "cfg-if 0.1.10", - "downcast", - "fragile", - "lazy_static", - "mockall_derive 0.8.3", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d614ad23f9bb59119b8b5670a85c7ba92c5e9adf4385c81ea00c51c8be33d5" +checksum = "e2be9a9090bc1cac2930688fa9478092a64c6a92ddc6ae0692d46b37d9cab709" dependencies = [ "cfg-if 1.0.0", "downcast", "fragile", "lazy_static", - "mockall_derive 0.9.1", + "mockall_derive", "predicates", "predicates-tree", ] [[package]] name = "mockall_derive" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c461918bf7f59eefb1459252756bf2351a995d6bd510d0b2061bd86bcdabfa6" -dependencies = [ - "cfg-if 0.1.10", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.67", -] - -[[package]] -name = "mockall_derive" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd4234635bca06fc96c7368d038061e0aae1b00a764dc817e900dc974e3deea" +checksum = "86d702a0530a0141cf4ed147cf5ec7be6f2c187d4e37fcbefc39cf34116bfe8f" dependencies = [ "cfg-if 1.0.0", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -3122,9 +3101,9 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -3133,9 +3112,9 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -3228,12 +3207,13 @@ dependencies = [ [[package]] name = "predicates" -version = "1.0.5" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a" +checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" dependencies = [ - "difference", + "difflib", "float-cmp", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -3297,9 +3277,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", "version_check 0.9.2", ] @@ -3309,7 +3289,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", "version_check 0.9.2", ] @@ -3337,11 +3317,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "cdcc2916cde080c1876ff40292a396541241fe0072ef928cd76582e9ea5d60d2" dependencies = [ - "unicode-xid 0.2.1", + "unicode-ident", ] [[package]] @@ -3395,7 +3375,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", ] [[package]] @@ -3901,9 +3881,9 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -3991,9 +3971,9 @@ version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -4046,9 +4026,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48b35457e9d855d3dc05ef32a73e0df1e2c0fd72c38796a4ee909160c8eeec2" dependencies = [ "darling 0.12.2", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -4327,9 +4307,9 @@ checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -4345,9 +4325,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ "heck", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -4369,13 +4349,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.67" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "unicode-xid 0.2.1", + "unicode-ident", ] [[package]] @@ -4384,9 +4364,9 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", "unicode-xid 0.2.1", ] @@ -4486,9 +4466,9 @@ version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -4697,9 +4677,9 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -4708,9 +4688,9 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", ] [[package]] @@ -5087,6 +5067,12 @@ dependencies = [ "matches", ] +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + [[package]] name = "unicode-normalization" version = "0.1.14" @@ -5277,9 +5263,9 @@ dependencies = [ "bumpalo", "lazy_static", "log 0.4.11", - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", "wasm-bindgen-shared", ] @@ -5311,9 +5297,9 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.41", "quote 1.0.9", - "syn 1.0.67", + "syn 1.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/chain/ethereum/Cargo.toml b/chain/ethereum/Cargo.toml index fa3a7021e0a..8724b219cc9 100644 --- a/chain/ethereum/Cargo.toml +++ b/chain/ethereum/Cargo.toml @@ -10,7 +10,7 @@ http = "0.1.21" # must be compatible with the version rust-web3 uses jsonrpc-core = "14.2.0" graph = { path = "../../graph" } lazy_static = "1.2.0" -mockall = "0.9.1" +mockall = "0.11.2" state_machine_future = "0.2" serde = "1.0" dirs-next = "2.0" diff --git a/graph/Cargo.toml b/graph/Cargo.toml index dd2ae5003bc..676b0a07018 100644 --- a/graph/Cargo.toml +++ b/graph/Cargo.toml @@ -28,7 +28,7 @@ fail = { version = "0.4", features = ["failpoints"] } futures = "0.1.21" graphql-parser = "0.3.0" lazy_static = "1.4.0" -mockall = "0.8.3" +mockall = "0.11.2" num-bigint = { version = "^0.2.6", features = ["serde"] } num_cpus = "1.13.0" num-traits = "0.2.14" diff --git a/mock/Cargo.toml b/mock/Cargo.toml index 4246e4eaea1..974c5b8adc2 100644 --- a/mock/Cargo.toml +++ b/mock/Cargo.toml @@ -8,5 +8,5 @@ futures = "0.1.21" graphql-parser = "0.3" graph = { path = "../graph" } graph-graphql = { path = "../graphql" } -mockall = "0.8" +mockall = "0.11" rand = "0.6.1"