diff --git a/Cargo.lock b/Cargo.lock index c8dea3d0b1..771fc15e4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5473,13 +5473,13 @@ dependencies = [ [[package]] name = "mockito" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", "colored", - "futures", + "futures-core", "hyper 0.14.27", "log", "rand 0.8.5", diff --git a/crates/chain-connector/src/connector.rs b/crates/chain-connector/src/connector.rs index a3fa9ead00..5ebcbf4e0e 100644 --- a/crates/chain-connector/src/connector.rs +++ b/crates/chain-connector/src/connector.rs @@ -867,7 +867,7 @@ mod tests { let expected_response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"{expected_data}\",\"id\":0}}"); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -894,7 +894,7 @@ mod tests { let expected_response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"{expected_data}\",\"id\":0}}"); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -919,7 +919,7 @@ mod tests { let expected_response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"{expected_data}\",\"id\":0}}"); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -949,7 +949,7 @@ mod tests { let expected_data = "0x0000000000000000000000000000000000000000000000000000000000000001"; let expected_response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"{expected_data}\",\"id\":0}}"); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1013,7 +1013,7 @@ mod tests { } ]"#; - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1069,7 +1069,7 @@ mod tests { } "#; - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); server .mock("POST", "/") @@ -1129,7 +1129,7 @@ mod tests { "result": "0x55bfec4a4400ca0b09e075e2b517041cd78b10021c51726cb73bcba52213fa05" } "#; - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); server .mock("POST", "/") @@ -1196,7 +1196,7 @@ mod tests { // This response causes the `buffer overrun while deserializing` error let app_cid_response = r#"[{"jsonrpc":"2.0", "id":0, "result": "0x"}]"#; - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1259,7 +1259,7 @@ mod tests { ]); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1320,7 +1320,7 @@ mod tests { let compute_units_response = "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002097ab88db9d8e48a1d55cd0205bd74721eb2ba70897d255f350062dec8fec7bb4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002988e97756c550265b7a570b41bb4d8dbf056a1ca0435265ad175c5ecced2ef600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d4af56c3a07423c4b976f6d1a43a96f4843bdc5479b01bf3bd73f69c1062738e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e9ab8214c37d615708ef89559407e1a015a0f7fbdaf3cd23a1f4c5ed2ae1c8cd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a717255e798920c9a9bbaae45492ff9020cdc8db3d8a44099015fbe950927368000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000df891a54a5479aa7ee3c019615ac55a18534aa81dcf3b2fbf7577d54cadf0c300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fbbd2b72d216685d97c09c56ca6ba16e7d2e35ff72bb69c72584ad8d9365610200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccff78d7a0c365cd3ba8842707a2f96f26ac7ea4dbd7aac04ae2f0958ef2252400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000db5fba69f5d2b2d04a5bf63b7abe1a2781470e77101e3afe6ec66794aec80c0a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005b96d1d71cf1b77421645ae4031558195d9df60abd73ea716c3df67d3e7832da00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e5cf187d01e552b0bd38ea89b9013e7b98915891cafb44fc7cf6937223290bcf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fe00f5915737e75aa5c7799dcf326020ab499a65c9d10e1e4951be8371aee6f2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c073f4fe89ebe1a354f052de5e371dc39e8d2b8f9ccbf0fc9e26e107217fe40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008510f943f7080e58846bc5044afa0c91480dbeca0ff5dcbef7c522a43531cffc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007d3ea3803085980a5b4e3bd93c32d8dae3b8060db9aab800e0922b7b18d865fc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002be7bd75150701c7ef8521d322fbcbb228cf907224d80e433550a3034bbcbb8b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e1469c97990a40da4465cb4e749faa2905adfc4b1109f7dc8b66ef8b1ed0a0c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008d20e7f50737ea4236c6d92b150e569aa2fc482699cc0165722210b4bcffdc4c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eae742035300aed3774579cab0c75416002438809f3cb3f62fb3c34dd0ab16790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029e9cc0f707e8e02578285b8e1d50c207fab5ec11b0b1e6f97834e1154abbe4b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005be58fc7ae8eb4e577b1be2a911a11fd17b90c8b6754aa71859ad6285bcc3b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008f7ba4e1f4bccd2aaf1f8791df5b73a6727b0720aba8fcf0afb6e1f07303c1cc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000053f668a26f5978f4f252145d68d2f0a627116c197a342a2e42aa269f46dcccf000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000db7ddcd38d772f1b043572bab7d890ea65723cf4805ee963f46b7a9f81a454f20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018fa36dd54f48c4c4ae40ceefca274460d4c83026f48fdcc4e201a1a0423561400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b6e3c818a1ecb540a289c81d0835dc41755f091ba70f02e5134203c195b80900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e77ef1585872eabfa78c01915cf0d43c3bd3bd63ae40565c62254a95bba901530000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000059810dcb510b17ca28693caa6d6164b6db28925290f345d8ef0ac8ef5751014f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6b992345e2ed6287ff2df0943d10f972ae7f63789d11df22f3fd9a4199f5c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005e58c2b5ba2b1a7d861de440a962fe0ffdcef1e240e3e50690f6f1f527bf7d66000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ca0be7865c187df9331bce42cd6ea3498d858a3d8b37fec18e9654ef320daa7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003938f3a12b19ed989431771df29f64ef011eec4da79e2ec30d86f28dae35f10a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; let compute_units_response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"{compute_units_response}\",\"id\":0}}"); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1365,7 +1365,7 @@ mod tests { CUID::from_hex("aa3046a12a1aac6e840625e6329d70b427328fec36dc8d273e5e6454b85633d5") .unwrap(); - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1426,7 +1426,7 @@ mod tests { } }] "#; - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") @@ -1481,7 +1481,7 @@ mod tests { } }] "#; - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/") diff --git a/crates/nox-tests/tests/builtin.rs b/crates/nox-tests/tests/builtin.rs index 304a00022d..32be3cef5e 100644 --- a/crates/nox-tests/tests/builtin.rs +++ b/crates/nox-tests/tests/builtin.rs @@ -2384,7 +2384,7 @@ async fn subnet_resolve() { "#; // Create a mock - let mut server = mockito::Server::new(); + let mut server = mockito::Server::new_async().await; let url = server.url(); let mock = server .mock("POST", "/")