From 9b1b06829b840f6f2a54b9b2cabfe12411d7fd32 Mon Sep 17 00:00:00 2001 From: nikkolasg Date: Fri, 1 Nov 2024 15:53:44 +0100 Subject: [PATCH] cleaning warnings --- Cargo.lock | 280 +++++++++--------- mp2-common/src/digest.rs | 5 +- mp2-common/src/group_hashing/mod.rs | 11 +- mp2-common/src/lib.rs | 1 + mp2-v1/src/lib.rs | 1 + mp2-v1/tests/common/cases/mod.rs | 6 +- recursion-framework/src/lib.rs | 1 + verifiable-db/src/cells_tree/api.rs | 3 +- verifiable-db/src/cells_tree/mod.rs | 5 +- verifiable-db/src/lib.rs | 1 + verifiable-db/src/query/api.rs | 35 +-- .../src/query/computational_hash_ids.rs | 1 + .../output_with_aggregation.rs | 1 - .../universal_circuit_inputs.rs | 1 + .../universal_query_circuit.rs | 10 +- verifiable-db/src/row_tree/full_node.rs | 9 +- verifiable-db/src/row_tree/leaf.rs | 5 +- verifiable-db/src/row_tree/mod.rs | 1 - 18 files changed, 170 insertions(+), 207 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a11b5087d..ef6888b87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,11 +100,11 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.38" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156bfc5dcd52ef9a5f33381701fa03310317e14c65093a9430d3e3557b08dcd3" +checksum = "4feb7c662fd0be3d0c926a456be4ac44e9cf8e05cbd91df6db7f7140b861016a" dependencies = [ - "alloy-primitives 0.8.8", + "alloy-primitives 0.8.10", "num_enum", "strum", ] @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f35429a652765189c1c5092870d8360ee7b7769b09b06d89ebaefd34676446" +checksum = "8edae627382349b56cd6a7a2106f4fd69b243a9233e560c55c2e03cabb7e1d3c" dependencies = [ "bytes", "cfg-if", @@ -359,7 +359,7 @@ dependencies = [ "futures-utils-wasm", "lru", "pin-project", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde", "serde_json", "tokio", @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" dependencies = [ "alloy-rlp-derive", "arrayvec 0.7.6", @@ -380,13 +380,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -400,7 +400,7 @@ dependencies = [ "alloy-transport-http", "futures", "pin-project", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde", "serde_json", "tokio", @@ -503,7 +503,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -520,7 +520,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", "syn-solidity", "tiny-keccak", ] @@ -538,7 +538,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.79", + "syn 2.0.86", "syn-solidity", ] @@ -592,7 +592,7 @@ checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698" dependencies = [ "alloy-json-rpc", "alloy-transport", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde_json", "tower", "tracing", @@ -635,9 +635,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -650,43 +650,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" [[package]] name = "ark-ff" @@ -858,7 +858,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -869,7 +869,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -902,7 +902,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -958,9 +958,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bb8" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10cf871f3ff2ce56432fddc2615ac7acc3aa22ca321f8fea800846fbb32f188" +checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" dependencies = [ "async-trait", "futures-util", @@ -1091,9 +1091,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -1174,9 +1174,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1243,7 +1243,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -1306,9 +1306,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -1538,7 +1538,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -1562,7 +1562,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -1573,7 +1573,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -1603,7 +1603,7 @@ checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -1647,7 +1647,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -1667,7 +1667,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", "unicode-xid", ] @@ -1841,9 +1841,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1874,7 +1874,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -2154,7 +2154,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.79", + "syn 2.0.86", "toml", "walkdir", ] @@ -2178,7 +2178,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.79", + "syn 2.0.86", "toml", "walkdir", ] @@ -2195,7 +2195,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -2211,7 +2211,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -2236,7 +2236,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.79", + "syn 2.0.86", "tempfile", "thiserror", "tiny-keccak", @@ -2266,7 +2266,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.79", + "syn 2.0.86", "tempfile", "thiserror", "tiny-keccak", @@ -2762,7 +2762,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -3141,9 +3141,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -3165,9 +3165,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -3190,7 +3190,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "rustls", "tokio", "tokio-rustls", @@ -3203,7 +3203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -3217,7 +3217,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "native-tls", "tokio", @@ -3227,16 +3227,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", "socket2", "tokio", @@ -3591,15 +3591,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -3965,7 +3965,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -4010,9 +4010,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -4031,7 +4031,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -4042,9 +4042,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -4275,7 +4275,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -4298,29 +4298,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -4510,7 +4510,7 @@ dependencies = [ "starkyx", "tokio", "tracing", - "uuid 1.10.0", + "uuid 1.11.0", ] [[package]] @@ -4520,7 +4520,7 @@ source = "git+https://github.com/Lagrange-Labs/succinctx?branch=fix-build#8580a6 dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -4590,12 +4590,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -4657,9 +4657,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -4811,9 +4811,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4873,7 +4873,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls", "hyper-tls 0.5.0", "ipnet", @@ -4905,9 +4905,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -4916,7 +4916,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -5115,7 +5115,7 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.1", - "syn 2.0.79", + "syn 2.0.86", "unicode-ident", ] @@ -5183,9 +5183,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -5307,33 +5307,33 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.11.3" +version = "2.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" +checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" dependencies = [ "cfg-if", - "derive_more 0.99.18", + "derive_more 1.0.0", "parity-scale-codec", "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "2.11.3" +version = "2.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" +checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.86", ] [[package]] name = "scc" -version = "2.2.2" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c1f7fc6deb21665a9060dfc7d271be784669295a31babdcd4dd2c79ae8cbfb" +checksum = "d8d25269dd3a12467afe2e510f69fb0b46b698e5afb296b59f2145259deaf8e8" dependencies = [ "sdd", ] @@ -5459,29 +5459,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -5562,7 +5562,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -5574,7 +5574,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -5624,7 +5624,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -5908,7 +5908,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -5972,9 +5972,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" dependencies = [ "proc-macro2", "quote", @@ -5990,7 +5990,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -6112,7 +6112,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -6126,22 +6126,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -6220,9 +6220,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -6244,7 +6244,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -6414,7 +6414,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -6617,9 +6617,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "serde", ] @@ -6755,7 +6755,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", "wasm-bindgen-shared", ] @@ -6789,7 +6789,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7126,7 +7126,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] @@ -7146,7 +7146,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.86", ] [[package]] diff --git a/mp2-common/src/digest.rs b/mp2-common/src/digest.rs index a876ab92a..9265af657 100644 --- a/mp2-common/src/digest.rs +++ b/mp2-common/src/digest.rs @@ -189,10 +189,7 @@ mod test { }; use crate::utils::TryIntoBool; use mp2_test::circuit::{run_circuit, UserCircuit}; - use plonky2::{ - field::types::Sample, - iop::witness::PartialWitness, - }; + use plonky2::{field::types::Sample, iop::witness::PartialWitness}; use plonky2_ecgfp5::{ curve::curve::Point, gadgets::curve::{CircuitBuilderEcGFp5, PartialWitnessCurve}, diff --git a/mp2-common/src/group_hashing/mod.rs b/mp2-common/src/group_hashing/mod.rs index 57d061952..819eb7c2b 100644 --- a/mp2-common/src/group_hashing/mod.rs +++ b/mp2-common/src/group_hashing/mod.rs @@ -234,11 +234,8 @@ pub fn cond_field_hashed_scalar_mul(cond: bool, mul: Point, base: Point) -> Poin #[cfg(test)] mod test { - use plonky2::{ - field::types::Sample, - iop::witness::PartialWitness, - }; - + use plonky2::{field::types::Sample, iop::witness::PartialWitness}; + use plonky2_ecgfp5::{ curve::curve::{Point, WeierstrassPoint}, gadgets::curve::{CircuitBuilderEcGFp5, CurveTarget, PartialWitnessCurve}, @@ -251,9 +248,7 @@ mod test { }; use mp2_test::circuit::{run_circuit, UserCircuit}; - use super::{ - circuit_hashed_scalar_mul, field_hashed_scalar_mul, weierstrass_to_point, - }; + use super::{circuit_hashed_scalar_mul, field_hashed_scalar_mul, weierstrass_to_point}; #[derive(Clone, Debug)] struct TestScalarMul { diff --git a/mp2-common/src/lib.rs b/mp2-common/src/lib.rs index f22640f16..ad8332d81 100644 --- a/mp2-common/src/lib.rs +++ b/mp2-common/src/lib.rs @@ -1,5 +1,6 @@ //! Utility functions and gadgets +#![allow(incomplete_features)] #![feature(generic_const_exprs)] #![feature(generic_arg_infer)] #![feature(const_for)] diff --git a/mp2-v1/src/lib.rs b/mp2-v1/src/lib.rs index eaf85ee65..0de0e6377 100644 --- a/mp2-v1/src/lib.rs +++ b/mp2-v1/src/lib.rs @@ -1,5 +1,6 @@ //! Circuits for v1 of Lagrange Proof Network (LPN) +#![allow(incomplete_features)] // Add this to allow generic const expressions, e.g. `PAD_LEN(NODE_LEN)`. #![feature(generic_const_exprs)] // Add this so we don't need to always specify const generic in generic diff --git a/mp2-v1/tests/common/cases/mod.rs b/mp2-v1/tests/common/cases/mod.rs index 4df2cffff..c6445467e 100644 --- a/mp2-v1/tests/common/cases/mod.rs +++ b/mp2-v1/tests/common/cases/mod.rs @@ -2,9 +2,9 @@ use contract::Contract; use mp2_v1::values_extraction::{ - identifier_for_mapping_key_column, identifier_for_mapping_value_column, - identifier_single_var_column, - }; + identifier_for_mapping_key_column, identifier_for_mapping_value_column, + identifier_single_var_column, +}; use table_source::{ContractExtractionArgs, TableSource}; use super::table::Table; diff --git a/recursion-framework/src/lib.rs b/recursion-framework/src/lib.rs index 0aea2ae4a..9a3517677 100644 --- a/recursion-framework/src/lib.rs +++ b/recursion-framework/src/lib.rs @@ -1,4 +1,5 @@ // #![warn(missing_docs)] +#![allow(incomplete_features)] #![feature(generic_const_exprs)] //! This crate provides a framework to build circuits that needs to recursively verify proofs diff --git a/verifiable-db/src/cells_tree/api.rs b/verifiable-db/src/cells_tree/api.rs index d2b4de1ab..64bd7ea7a 100644 --- a/verifiable-db/src/cells_tree/api.rs +++ b/verifiable-db/src/cells_tree/api.rs @@ -24,7 +24,7 @@ use serde::{Deserialize, Serialize}; use std::array; type LeafInput = LeafCircuit; -type ChildInput = ProofInputSerialized; +pub type ChildInput = ProofInputSerialized; /// CircuitInput is a wrapper around the different specialized circuits that can /// be used to prove a node recursively. @@ -204,6 +204,7 @@ impl PublicParameters { } /// Get the proof of an empty node. + #[allow(dead_code)] pub(crate) fn empty_node_proof(&self) -> &ProofWithVK { &self.empty_node_proof } diff --git a/verifiable-db/src/cells_tree/mod.rs b/verifiable-db/src/cells_tree/mod.rs index af0e85846..69f7c83a7 100644 --- a/verifiable-db/src/cells_tree/mod.rs +++ b/verifiable-db/src/cells_tree/mod.rs @@ -33,7 +33,7 @@ pub use public_inputs::PublicInputs; /// A cell represents a column || value tuple. it can be given in the cells tree or as the /// secondary index value in the row tree. #[derive(Clone, Debug, Serialize, Deserialize, Constructor)] -pub(crate) struct Cell { +pub struct Cell { /// identifier of the column for the secondary index pub(crate) identifier: F, /// secondary index value @@ -48,13 +48,16 @@ impl Cell { pw.set_target(wires.identifier, self.identifier); pw.set_bool_target(wires.is_multiplier, self.is_multiplier); } + #[allow(dead_code)] pub(crate) fn digest(&self) -> Digest { map_to_curve_point(&self.to_fields()) } + #[allow(dead_code)] pub(crate) fn split_digest(&self) -> SplitDigestPoint { let digest = self.digest(); SplitDigestPoint::from_single_digest_point(digest, self.is_multiplier) } + #[allow(dead_code)] pub(crate) fn split_and_accumulate_digest( &self, child_digest: SplitDigestPoint, diff --git a/verifiable-db/src/lib.rs b/verifiable-db/src/lib.rs index 66ff71b1b..c35e96645 100644 --- a/verifiable-db/src/lib.rs +++ b/verifiable-db/src/lib.rs @@ -1,5 +1,6 @@ // Add this to allow generic const expressions, e.g. `PAD_LEN(NODE_LEN)`. +#![allow(incomplete_features)] #![feature(generic_const_exprs)] // Add this to allow generic const items, e.g. `const IO_LEN` #![feature(generic_const_items)] diff --git a/verifiable-db/src/query/api.rs b/verifiable-db/src/query/api.rs index e87b068d9..2ec22783d 100644 --- a/verifiable-db/src/query/api.rs +++ b/verifiable-db/src/query/api.rs @@ -839,12 +839,6 @@ mod tests { const MAX_NUM_PREDICATE_OPS: usize = 20; const MAX_NUM_RESULT_OPS: usize = 20; const MAX_NUM_RESULTS: usize = 10; - let column_ids = (0..NUM_COLUMNS) - .map(|_| { - let id: u32 = rng.gen(); - id as u64 - }) - .collect_vec(); let column_ids = ColumnIDs::new( F::rand().to_canonical_u64(), F::rand().to_canonical_u64(), @@ -1392,11 +1386,6 @@ mod tests { column_values[0][0], ); let hash_0 = node_info_0.compute_node_hash(primary_index_id); - let column_cells = column_values[0] - .iter() - .zip(column_ids.to_vec().iter()) - .map(|(&value, &id)| ColumnCell::new(id.to_canonical_u64(), value)) - .collect_vec(); // compute hashes associated to query, which are needed as inputs let query_hashes = QueryHashNonExistenceCircuits::new::< MAX_NUM_COLUMNS, @@ -1501,11 +1490,6 @@ mod tests { // generate non-existence proof starting from intermediate node (i.e., node 1) rather than a leaf node // generate proof with non-existence circuit for node 1 - let column_cells = column_values[1] - .iter() - .zip(column_ids.to_vec().iter()) - .map(|(&value, &id)| ColumnCell::new(id.to_canonical_u64(), value)) - .collect_vec(); // compute hashes associated to query, which are needed as inputs let query_hashes = QueryHashNonExistenceCircuits::new::< MAX_NUM_COLUMNS, @@ -1604,11 +1588,6 @@ mod tests { column_values[2][1], ); let hash_2 = node_info_2.compute_node_hash(secondary_index_id); - let column_cells = column_values[2] - .iter() - .zip(column_ids.to_vec().iter()) - .map(|(&value, &id)| ColumnCell::new(id.to_canonical_u64(), value)) - .collect_vec(); // compute hashes associated to query, which are needed as inputs let query_hashes = QueryHashNonExistenceCircuits::new::< MAX_NUM_COLUMNS, @@ -1679,7 +1658,7 @@ mod tests { assert_eq!(hash_1, get_tree_hash_from_proof(&proof_1),); // generate proof for node A (leaf of index tree) - let node_info_A = NodeInfo::new( + let node_info_a = NodeInfo::new( &HashOutput::try_from(hash_1.to_bytes()).unwrap(), None, None, @@ -1687,20 +1666,20 @@ mod tests { column_values[0][0], column_values[0][0], ); - let hash_A = node_info_A.compute_node_hash(primary_index_id); + let hash_a = node_info_a.compute_node_hash(primary_index_id); let subtree_proof = SubProof::new_embedded_tree_proof(proof_1).unwrap(); let input = Input::new_single_path( subtree_proof, None, None, - node_info_A.clone(), + node_info_a.clone(), false, &query_bounds, ) .unwrap(); - let proof_A = params.generate_proof(input).unwrap(); + let proof_a = params.generate_proof(input).unwrap(); // check hash - assert_eq!(hash_A, get_tree_hash_from_proof(&proof_A),); + assert_eq!(hash_a, get_tree_hash_from_proof(&proof_a),); // generate proof for node B rows tree // all the nodes are in the range, so we generate proofs for each of the nodes @@ -1730,14 +1709,14 @@ mod tests { // generate proof for node B of the index tree (root node) let node_info_root = NodeInfo::new( &HashOutput::try_from(hash_4.to_bytes()).unwrap(), - Some(&HashOutput::try_from(hash_A.to_bytes()).unwrap()), + Some(&HashOutput::try_from(hash_a.to_bytes()).unwrap()), None, column_values[4][0], column_values[0][0], column_values[5][0], ); let input = Input::new_partial_node( - proof_A, + proof_a, proof_4, None, ChildPosition::Left, diff --git a/verifiable-db/src/query/computational_hash_ids.rs b/verifiable-db/src/query/computational_hash_ids.rs index 95422063c..c6d8618ed 100644 --- a/verifiable-db/src/query/computational_hash_ids.rs +++ b/verifiable-db/src/query/computational_hash_ids.rs @@ -632,6 +632,7 @@ impl FromFields for AggregationOperation { impl AggregationOperation { /// Return the identity value for `self` operation + #[allow(dead_code)] pub(crate) fn identity_value(&self) -> Vec { match self { AggregationOperation::SumOp => U256::ZERO.to_fields(), diff --git a/verifiable-db/src/query/universal_circuit/output_with_aggregation.rs b/verifiable-db/src/query/universal_circuit/output_with_aggregation.rs index b23174c19..98aaeb53f 100644 --- a/verifiable-db/src/query/universal_circuit/output_with_aggregation.rs +++ b/verifiable-db/src/query/universal_circuit/output_with_aggregation.rs @@ -214,7 +214,6 @@ mod tests { utils::{gen_random_field_hash, gen_random_u256}, }; use plonky2::{ - field::types::Field, iop::{ target::{BoolTarget, Target}, witness::{PartialWitness, WitnessWrite}, diff --git a/verifiable-db/src/query/universal_circuit/universal_circuit_inputs.rs b/verifiable-db/src/query/universal_circuit/universal_circuit_inputs.rs index 4f245566a..6da699718 100644 --- a/verifiable-db/src/query/universal_circuit/universal_circuit_inputs.rs +++ b/verifiable-db/src/query/universal_circuit/universal_circuit_inputs.rs @@ -344,6 +344,7 @@ impl ResultStructure { /// `column_values` as the operands for the operations having `InputOperand::Column` /// operands, and the provided `placeholders` for the operations having `InputOperand::Placeholder` /// operands. + #[cfg(test)] pub(crate) fn compute_output_values( &self, column_values: &[U256], diff --git a/verifiable-db/src/query/universal_circuit/universal_query_circuit.rs b/verifiable-db/src/query/universal_circuit/universal_query_circuit.rs index df619ba35..960434d76 100644 --- a/verifiable-db/src/query/universal_circuit/universal_query_circuit.rs +++ b/verifiable-db/src/query/universal_circuit/universal_query_circuit.rs @@ -967,14 +967,6 @@ fn dummy_placeholder(placeholders: &Placeholders) -> Placeholder { } } -fn dummy_placeholder_from_query_bounds(query_bounds: &QueryBounds) -> Placeholder { - let placeholders = Placeholders::new_empty( - query_bounds.min_query_primary(), - query_bounds.max_query_primary(), - ); - dummy_placeholder(&placeholders) -} - pub(crate) fn dummy_placeholder_id() -> PlaceholderId { PlaceholderIdentifier::default() } @@ -1169,7 +1161,7 @@ mod tests { utils::gen_random_u256, }; use plonky2::{ - field::types::{Field, PrimeField64, Sample}, + field::types::{PrimeField64, Sample}, hash::hashing::hash_n_to_hash_no_pad, iop::witness::PartialWitness, plonk::{circuit_builder::CircuitBuilder, config::GenericHashOut}, diff --git a/verifiable-db/src/row_tree/full_node.rs b/verifiable-db/src/row_tree/full_node.rs index fd4ad588d..5a4ae96c0 100644 --- a/verifiable-db/src/row_tree/full_node.rs +++ b/verifiable-db/src/row_tree/full_node.rs @@ -1,12 +1,7 @@ use derive_more::{From, Into}; use mp2_common::{ - default_config, - poseidon::H, - proof::ProofWithVK, - public_inputs::PublicInputCommon, - u256::CircuitBuilderU256, - utils::ToTargets, - C, D, F, + default_config, poseidon::H, proof::ProofWithVK, public_inputs::PublicInputCommon, + u256::CircuitBuilderU256, utils::ToTargets, C, D, F, }; use plonky2::{ iop::{target::Target, witness::PartialWitness}, diff --git a/verifiable-db/src/row_tree/leaf.rs b/verifiable-db/src/row_tree/leaf.rs index d791c8c91..f28c23646 100644 --- a/verifiable-db/src/row_tree/leaf.rs +++ b/verifiable-db/src/row_tree/leaf.rs @@ -8,10 +8,7 @@ use mp2_common::{ C, D, F, }; use plonky2::{ - iop::{ - target::Target, - witness::PartialWitness, - }, + iop::{target::Target, witness::PartialWitness}, plonk::{circuit_builder::CircuitBuilder, proof::ProofWithPublicInputsTarget}, }; use recursion_framework::{ diff --git a/verifiable-db/src/row_tree/mod.rs b/verifiable-db/src/row_tree/mod.rs index bd209fe19..c76daa172 100644 --- a/verifiable-db/src/row_tree/mod.rs +++ b/verifiable-db/src/row_tree/mod.rs @@ -1,4 +1,3 @@ - mod api; mod full_node; mod leaf;