Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into mempool
Browse files Browse the repository at this point in the history
# 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
Mododo committed May 9, 2024
2 parents 3c8b9ce + da067e3 commit 21f6e94
Show file tree
Hide file tree
Showing 133 changed files with 4,249 additions and 1,691 deletions.
14 changes: 13 additions & 1 deletion .clippy.toml
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" },
]
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@ perf.data*

zerostate.json
zerostate.boc

config.json
global-config.json
keys.json
logger.json

db/
.temp/
Loading

0 comments on commit 21f6e94

Please sign in to comment.