-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/master' into mempool
# Conflicts: # Cargo.lock # collator/Cargo.toml # collator/src/mempool/mempool_adapter.rs # collator/src/mempool/tests/mempool_adapter_tests.rs # consensus/src/intercom/dispatcher.rs # consensus/src/intercom/responses.rs # util/src/test/logger.rs
- Loading branch information
Showing
133 changed files
with
4,249 additions
and
1,691 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,14 @@ | ||
allow-print-in-tests = true | ||
allow-dbg-in-tests = true | ||
allow-dbg-in-tests = true | ||
|
||
# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_methods | ||
disallowed-methods = [ | ||
{ path = "std::fs::File::create", reason = "use tycho_storage::FileDb instead" }, | ||
{ path = "std::fs::File::create_new", reason = "use tycho_storage::FileDb instead" }, | ||
{ path = "std::fs::File::open", reason = "use tycho_storage::FileDb instead" }, | ||
{ path = "std::fs::File::options", reason = "use tycho_storage::FileDb instead" }, | ||
] | ||
|
||
disallowed-types = [ | ||
{ path = "std::fs::OpenOptions", reason = "use tycho_storage::FileDb instead" }, | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,3 +14,11 @@ perf.data* | |
|
||
zerostate.json | ||
zerostate.boc | ||
|
||
config.json | ||
global-config.json | ||
keys.json | ||
logger.json | ||
|
||
db/ | ||
.temp/ |
Oops, something went wrong.