mirrors/arti.git/crates/tor-hsclient/src/state.rs, branch arti-v1.1.7mirror of https://gitlab.torproject.org/tpo/core/arti
http://git.dilluti0n.com/mirrors/arti.git/atom?h=arti-v1.1.72023-07-24T12:46:05ZRun cargo +nightly fmt to format many let ... else ...2023-07-24T12:46:05ZIan Jacksonijackson@chiark.greenend.org.uk2023-07-24T12:46:05Zurn:sha1:3e2a909707acf7cad2621316a51f8643f1fe908a
rustfmt has grown opinions about how let ... else ... ought to be
formatted. They don't always agree with our previous manual
decisions.
I think our policy is to always insist on rustfmt. When that version
of rustfmt hits stable, our CI will start to fail for everyone.
(Right now this discrepancy just causes trouble for contributors who
are using nightly by default.)
Run maint/add_warning to actually apply new lint allows2023-07-10T12:49:51ZIan Jacksonijackson@chiark.greenend.org.uk2023-07-10T11:19:32Zurn:sha1:473447a82e099fd52a674c28f5bc24b3e05208c0Throughout: Use *_report!() macros for reporting Errors.2023-07-07T17:00:21ZNick Mathewsonnickm@torproject.org2023-07-07T13:54:27Zurn:sha1:25c6fe61e4cf230210dffdac2d3c281fcb31c5a9
I identified the cases to replace by searching for the string
`.report()`. There are a few that I didn't change:
* A couple of cases that used anyhow::Error,
* One case that reported two Errors.
* Two cases in `tor_hsclient::err` that just did
`error!("Bug: {}")`.
I have also not audited the cases in `tor-hsclient` where we're using
`tor_error::Report` manually.
Nonetheless, closes #949.
tor-hsclient: Abolish ad-hoc real-world-time sleeps2023-07-06T14:14:40ZIan Jacksonijackson@chiark.greenend.org.uk2023-07-05T10:47:38Zurn:sha1:bc63fdb34c2bb910a3d0ed38a8c6378ded4230c2
Now we can reliably wait precisely for the tasks to be all waiting.
This test case no longer involves any real executor.
tor-hsclient: Reimplement Debug for MockCirc2023-06-29T15:11:03ZIan Jacksonijackson@chiark.greenend.org.uk2023-06-28T10:03:35Zurn:sha1:2b2ecfbb3916bedcdadff50654be78477a62b5d5
This is less code. Also it now dumps the connect_called field which
was introduced in the meantime.
HS configuration: Plumb configuration through (fmt)2023-06-28T12:32:54ZIan Jacksonijackson@chiark.greenend.org.uk2023-06-26T11:59:28Zurn:sha1:a0b6f34e42ad9098c95c9ab532efcb0bc379f290
Apply deferred rustfmt churn.
HS configuration: Plumb configuration through2023-06-28T12:32:54ZIan Jacksonijackson@chiark.greenend.org.uk2023-06-23T16:22:41Zurn:sha1:984652217a6d8b0c82c47a418531eb4112a4695c
Invent a trait a la circmgr config for the hs client connector config.
Plumb a suitable value all the way through to the code that will use it.
tor-hsclient: Increase some timeouts2023-06-26T16:57:33ZIan Jacksonijackson@chiark.greenend.org.uk2023-06-26T16:04:36Zurn:sha1:062b7e7cedf95de260f9613085443fa7399b7637
1. Fix a use of 10ms that should have been TIMEOUT_SLOP.
2. Increase BODGE_YIELD by a factor of 5.
Now this test should tolerate being hung up for 125ms. I am hoping
that this will fix the CI failure
https://gitlab.torproject.org/Diziet/arti/-/jobs/302457
which fails at the line comparing circuit1 with circuit2a.
(I can't repro that locally.)
tor-hsclient: test: Introduce some constants for timings2023-06-26T16:57:33ZIan Jacksonijackson@chiark.greenend.org.uk2023-06-26T16:02:25Zurn:sha1:e5c45519936fbdecf2d1e6de6153a393c9e05739tor-hsclient: test: Add another sleep for expiry task *start*2023-06-26T16:55:10ZIan Jacksonijackson@chiark.greenend.org.uk2023-06-26T14:59:16Zurn:sha1:c8d1cdded716ec4d8280db20f78a69a569ba5872
Without this, the expiry task can end up choosing a 600s timeout
starting *after we advanced the clock*.
Fixes #923