From 028bec1469b5207bf5f07299b1483c8a5df7a98f Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Fri, 11 Aug 2023 03:36:32 +0200 Subject: [PATCH] chore: crates/ directory --- .gitattributes | 2 +- Cargo.toml | 40 +++--- {abi => crates/abi}/Cargo.toml | 0 {abi => crates/abi}/README.md | 0 {abi => crates/abi}/abi/Console.sol | 0 {abi => crates/abi}/abi/HEVM.sol | 0 {abi => crates/abi}/abi/HardhatConsole.json | 0 {abi => crates/abi}/build.rs | 0 {abi => crates/abi}/src/bindings/console.rs | 0 .../abi}/src/bindings/hardhat_console.rs | 0 {abi => crates/abi}/src/bindings/hevm.rs | 0 {abi => crates/abi}/src/bindings/mod.rs | 0 {abi => crates/abi}/src/lib.rs | 0 {anvil => crates/anvil}/Cargo.toml | 0 {anvil => crates/anvil}/README.md | 0 {anvil => crates/anvil}/build.rs | 0 {anvil => crates/anvil}/core/Cargo.toml | 0 {anvil => crates/anvil}/core/src/eth/block.rs | 0 {anvil => crates/anvil}/core/src/eth/mod.rs | 0 {anvil => crates/anvil}/core/src/eth/proof.rs | 0 .../anvil}/core/src/eth/receipt.rs | 0 .../anvil}/core/src/eth/serde_helpers.rs | 0 {anvil => crates/anvil}/core/src/eth/state.rs | 0 .../anvil}/core/src/eth/subscription.rs | 0 .../core/src/eth/transaction/ethers_compat.rs | 0 .../anvil}/core/src/eth/transaction/mod.rs | 0 {anvil => crates/anvil}/core/src/eth/trie.rs | 0 {anvil => crates/anvil}/core/src/eth/utils.rs | 0 {anvil => crates/anvil}/core/src/lib.rs | 0 {anvil => crates/anvil}/core/src/types.rs | 0 {anvil => crates/anvil}/rpc/Cargo.toml | 0 {anvil => crates/anvil}/rpc/src/error.rs | 0 {anvil => crates/anvil}/rpc/src/lib.rs | 0 {anvil => crates/anvil}/rpc/src/request.rs | 0 {anvil => crates/anvil}/rpc/src/response.rs | 0 {anvil => crates/anvil}/server/Cargo.toml | 0 {anvil => crates/anvil}/server/src/config.rs | 0 {anvil => crates/anvil}/server/src/error.rs | 0 {anvil => crates/anvil}/server/src/handler.rs | 0 {anvil => crates/anvil}/server/src/ipc.rs | 0 {anvil => crates/anvil}/server/src/lib.rs | 0 {anvil => crates/anvil}/server/src/pubsub.rs | 0 {anvil => crates/anvil}/server/src/ws.rs | 0 {anvil => crates/anvil}/src/anvil.rs | 0 {anvil => crates/anvil}/src/cmd.rs | 0 {anvil => crates/anvil}/src/config.rs | 0 {anvil => crates/anvil}/src/eth/api.rs | 0 .../anvil}/src/eth/backend/cheats.rs | 0 {anvil => crates/anvil}/src/eth/backend/db.rs | 0 .../anvil}/src/eth/backend/executor.rs | 0 .../anvil}/src/eth/backend/fork.rs | 0 .../anvil}/src/eth/backend/genesis.rs | 0 .../anvil}/src/eth/backend/info.rs | 0 .../anvil}/src/eth/backend/mem/cache.rs | 0 .../anvil}/src/eth/backend/mem/fork_db.rs | 0 .../src/eth/backend/mem/in_memory_db.rs | 0 .../anvil}/src/eth/backend/mem/inspector.rs | 0 .../anvil}/src/eth/backend/mem/mod.rs | 0 .../anvil}/src/eth/backend/mem/state.rs | 0 .../anvil}/src/eth/backend/mem/storage.rs | 0 .../anvil}/src/eth/backend/mod.rs | 0 .../anvil}/src/eth/backend/notifications.rs | 0 .../anvil}/src/eth/backend/time.rs | 0 .../anvil}/src/eth/backend/validate.rs | 0 {anvil => crates/anvil}/src/eth/error.rs | 0 {anvil => crates/anvil}/src/eth/fees.rs | 0 {anvil => crates/anvil}/src/eth/macros.rs | 0 {anvil => crates/anvil}/src/eth/miner.rs | 0 {anvil => crates/anvil}/src/eth/mod.rs | 0 .../anvil}/src/eth/otterscan/api.rs | 0 .../anvil}/src/eth/otterscan/mod.rs | 0 .../anvil}/src/eth/otterscan/types.rs | 0 {anvil => crates/anvil}/src/eth/pool/mod.rs | 0 .../anvil}/src/eth/pool/transactions.rs | 0 {anvil => crates/anvil}/src/eth/sign.rs | 0 {anvil => crates/anvil}/src/eth/util.rs | 0 {anvil => crates/anvil}/src/filter.rs | 0 {anvil => crates/anvil}/src/genesis.rs | 0 {anvil => crates/anvil}/src/hardfork.rs | 0 {anvil => crates/anvil}/src/lib.rs | 0 {anvil => crates/anvil}/src/logging.rs | 0 {anvil => crates/anvil}/src/pubsub.rs | 0 {anvil => crates/anvil}/src/server/error.rs | 0 {anvil => crates/anvil}/src/server/handler.rs | 0 {anvil => crates/anvil}/src/server/mod.rs | 0 {anvil => crates/anvil}/src/service.rs | 0 {anvil => crates/anvil}/src/shutdown.rs | 0 .../anvil}/src/tasks/block_listener.rs | 0 {anvil => crates/anvil}/src/tasks/mod.rs | 0 .../anvil}/test-data/SimpleStorage.json | 0 .../anvil}/test-data/SimpleStorage.sol | 0 .../anvil}/test-data/emit_logs.json | 0 .../anvil}/test-data/emit_logs.sol | 0 .../anvil}/test-data/greeter.json | 0 .../anvil}/test-data/multicall.json | 0 .../anvil}/test-data/multicall.sol | 0 {anvil => crates/anvil}/tests/it/abi.rs | 0 {anvil => crates/anvil}/tests/it/anvil.rs | 0 {anvil => crates/anvil}/tests/it/anvil_api.rs | 0 {anvil => crates/anvil}/tests/it/api.rs | 0 {anvil => crates/anvil}/tests/it/fork.rs | 0 {anvil => crates/anvil}/tests/it/ganache.rs | 0 {anvil => crates/anvil}/tests/it/gas.rs | 0 {anvil => crates/anvil}/tests/it/genesis.rs | 0 {anvil => crates/anvil}/tests/it/geth.rs | 0 {anvil => crates/anvil}/tests/it/ipc.rs | 0 {anvil => crates/anvil}/tests/it/logs.rs | 0 {anvil => crates/anvil}/tests/it/main.rs | 0 {anvil => crates/anvil}/tests/it/otterscan.rs | 0 .../anvil}/tests/it/proof/eip1186.rs | 0 {anvil => crates/anvil}/tests/it/proof/mod.rs | 0 {anvil => crates/anvil}/tests/it/pubsub.rs | 0 {anvil => crates/anvil}/tests/it/revert.rs | 0 {anvil => crates/anvil}/tests/it/sign.rs | 0 {anvil => crates/anvil}/tests/it/traces.rs | 0 .../anvil}/tests/it/transaction.rs | 0 {anvil => crates/anvil}/tests/it/txpool.rs | 0 {anvil => crates/anvil}/tests/it/utils.rs | 0 {anvil => crates/anvil}/tests/it/wsapi.rs | 0 {binder => crates/binder}/Cargo.toml | 0 {binder => crates/binder}/README.md | 0 {binder => crates/binder}/src/lib.rs | 0 {binder => crates/binder}/src/utils.rs | 0 {cast => crates/cast}/Cargo.toml | 0 {cast => crates/cast}/README.md | 0 {cast => crates/cast}/src/base.rs | 0 {cast => crates/cast}/src/errors.rs | 0 {cast => crates/cast}/src/lib.rs | 0 {cast => crates/cast}/src/rlp_converter.rs | 0 {cast => crates/cast}/src/tx.rs | 0 {chisel => crates/chisel}/Cargo.toml | 0 {chisel => crates/chisel}/README.md | 0 {chisel => crates/chisel}/assets/preview.gif | Bin {chisel => crates/chisel}/assets/preview.tape | 0 .../chisel}/benches/session_source.rs | 0 {chisel => crates/chisel}/build.rs | 0 {chisel => crates/chisel}/src/bin/chisel.rs | 0 {chisel => crates/chisel}/src/cmd.rs | 0 {chisel => crates/chisel}/src/dispatcher.rs | 0 {chisel => crates/chisel}/src/executor.rs | 0 {chisel => crates/chisel}/src/history.rs | 0 {chisel => crates/chisel}/src/lib.rs | 0 {chisel => crates/chisel}/src/runner.rs | 0 {chisel => crates/chisel}/src/session.rs | 0 .../chisel}/src/session_source.rs | 2 +- .../chisel}/src/solidity_helper.rs | 0 {chisel => crates/chisel}/tests/cache.rs | 0 {cli => crates/cli}/Cargo.toml | 0 {cli => crates/cli}/README.md | 0 {cli => crates/cli}/assets/.gitignoreTemplate | 0 .../cli}/assets/CounterTemplate.s.sol | 0 .../cli}/assets/CounterTemplate.sol | 0 .../cli}/assets/CounterTemplate.t.sol | 0 {cli => crates/cli}/assets/README.md | 0 .../cli}/assets/generated/TestTemplate.t.sol | 0 .../cli}/assets/workflowTemplate.yml | 0 {cli => crates/cli}/benches/cast.rs | 0 {cli => crates/cli}/benches/forge_test.rs | 0 {cli => crates/cli}/build.rs | 0 .../cli}/src/cast/cmd/access_list.rs | 0 {cli => crates/cli}/src/cast/cmd/bind.rs | 0 {cli => crates/cli}/src/cast/cmd/call.rs | 0 {cli => crates/cli}/src/cast/cmd/create2.rs | 0 {cli => crates/cli}/src/cast/cmd/estimate.rs | 0 .../cli}/src/cast/cmd/find_block.rs | 0 {cli => crates/cli}/src/cast/cmd/interface.rs | 0 {cli => crates/cli}/src/cast/cmd/logs.rs | 0 {cli => crates/cli}/src/cast/cmd/mod.rs | 0 {cli => crates/cli}/src/cast/cmd/rpc.rs | 0 {cli => crates/cli}/src/cast/cmd/run.rs | 0 {cli => crates/cli}/src/cast/cmd/send.rs | 0 {cli => crates/cli}/src/cast/cmd/storage.rs | 0 .../cli}/src/cast/cmd/wallet/mod.rs | 0 .../cli}/src/cast/cmd/wallet/vanity.rs | 0 {cli => crates/cli}/src/cast/main.rs | 0 {cli => crates/cli}/src/cast/opts.rs | 0 {cli => crates/cli}/src/forge/cmd/bind.rs | 0 {cli => crates/cli}/src/forge/cmd/build.rs | 0 {cli => crates/cli}/src/forge/cmd/cache.rs | 0 {cli => crates/cli}/src/forge/cmd/config.rs | 0 {cli => crates/cli}/src/forge/cmd/coverage.rs | 0 {cli => crates/cli}/src/forge/cmd/create.rs | 0 {cli => crates/cli}/src/forge/cmd/debug.rs | 0 {cli => crates/cli}/src/forge/cmd/doc.rs | 0 {cli => crates/cli}/src/forge/cmd/flatten.rs | 0 {cli => crates/cli}/src/forge/cmd/fmt.rs | 0 {cli => crates/cli}/src/forge/cmd/fourbyte.rs | 0 .../cli}/src/forge/cmd/geiger/error.rs | 0 .../cli}/src/forge/cmd/geiger/find.rs | 0 .../cli}/src/forge/cmd/geiger/mod.rs | 0 .../cli}/src/forge/cmd/geiger/visitor.rs | 0 .../cli}/src/forge/cmd/generate/mod.rs | 0 {cli => crates/cli}/src/forge/cmd/init.rs | 0 {cli => crates/cli}/src/forge/cmd/inspect.rs | 0 {cli => crates/cli}/src/forge/cmd/install.rs | 0 {cli => crates/cli}/src/forge/cmd/mod.rs | 0 .../cli}/src/forge/cmd/remappings.rs | 0 {cli => crates/cli}/src/forge/cmd/remove.rs | 0 {cli => crates/cli}/src/forge/cmd/retry.rs | 0 .../cli}/src/forge/cmd/script/artifacts.rs | 0 .../cli}/src/forge/cmd/script/broadcast.rs | 0 .../cli}/src/forge/cmd/script/build.rs | 0 .../cli}/src/forge/cmd/script/cmd.rs | 0 .../cli}/src/forge/cmd/script/executor.rs | 0 .../cli}/src/forge/cmd/script/mod.rs | 0 .../cli}/src/forge/cmd/script/multi.rs | 0 .../cli}/src/forge/cmd/script/providers.rs | 0 .../cli}/src/forge/cmd/script/receipts.rs | 0 .../cli}/src/forge/cmd/script/runner.rs | 0 .../cli}/src/forge/cmd/script/sequence.rs | 0 .../cli}/src/forge/cmd/script/transaction.rs | 0 .../cli}/src/forge/cmd/script/verify.rs | 0 .../cli}/src/forge/cmd/selectors.rs | 0 {cli => crates/cli}/src/forge/cmd/snapshot.rs | 0 .../cli}/src/forge/cmd/test/filter.rs | 0 {cli => crates/cli}/src/forge/cmd/test/mod.rs | 0 {cli => crates/cli}/src/forge/cmd/tree.rs | 0 {cli => crates/cli}/src/forge/cmd/update.rs | 0 .../src/forge/cmd/verify/etherscan/flatten.rs | 0 .../src/forge/cmd/verify/etherscan/mod.rs | 0 .../cmd/verify/etherscan/standard_json.rs | 0 .../cli}/src/forge/cmd/verify/mod.rs | 0 .../cli}/src/forge/cmd/verify/provider.rs | 0 .../cli}/src/forge/cmd/verify/sourcify.rs | 0 {cli => crates/cli}/src/forge/cmd/watch.rs | 0 {cli => crates/cli}/src/forge/main.rs | 0 {cli => crates/cli}/src/forge/opts.rs | 0 {cli => crates/cli}/src/handler.rs | 0 {cli => crates/cli}/src/lib.rs | 0 {cli => crates/cli}/src/opts/build/core.rs | 0 {cli => crates/cli}/src/opts/build/mod.rs | 0 {cli => crates/cli}/src/opts/build/paths.rs | 0 {cli => crates/cli}/src/opts/chain.rs | 0 {cli => crates/cli}/src/opts/dependency.rs | 0 {cli => crates/cli}/src/opts/ethereum.rs | 0 {cli => crates/cli}/src/opts/mod.rs | 0 {cli => crates/cli}/src/opts/transaction.rs | 0 {cli => crates/cli}/src/opts/wallet/error.rs | 0 {cli => crates/cli}/src/opts/wallet/mod.rs | 0 .../cli}/src/opts/wallet/multi_wallet.rs | 0 {cli => crates/cli}/src/stdin.rs | 0 {cli => crates/cli}/src/utils/cmd.rs | 0 {cli => crates/cli}/src/utils/mod.rs | 0 {cli => crates/cli}/src/utils/suggestions.rs | 0 {cli => crates/cli}/test-utils/Cargo.toml | 0 {cli => crates/cli}/test-utils/src/lib.rs | 0 {cli => crates/cli}/test-utils/src/macros.rs | 0 {cli => crates/cli}/test-utils/src/script.rs | 2 +- {cli => crates/cli}/test-utils/src/util.rs | 4 +- .../cli}/tests/fixtures/ERC20Artifact.json | 0 .../cli}/tests/fixtures/ScriptVerify.sol | 0 .../fixtures/can_build_skip_contracts.stdout | 0 .../tests/fixtures/can_build_skip_glob.stdout | 0 .../tests/fixtures/can_check_snapshot.stdout | 0 .../can_create_template_contract-2nd.stdout | 0 .../can_create_template_contract.stdout | 0 .../can_create_using_unlocked-2nd.stdout | 0 .../fixtures/can_create_using_unlocked.stdout | 0 ...can_detect_dirty_git_status_on_init.stderr | 0 ...n_execute_script_and_skip_contracts.stdout | 0 .../can_execute_script_command.stdout | 0 .../can_execute_script_command_fqn.stdout | 0 ...an_execute_script_command_with_args.stdout | 0 ...xecute_script_command_with_returned.stdout | 0 ...can_execute_script_command_with_sig.stdout | 0 .../can_run_test_in_custom_test_folder.stdout | 0 .../fixtures/can_set_yul_optimizer.stderr | 0 .../tests/fixtures/can_test_repeatedly.stdout | 0 .../can_use_libs_in_multi_fork.stdout | 0 .../cli}/tests/fixtures/cast_logs.stdout | 0 ...--560d246fcddc9ea98a8b032c9a2f474efb493c28 | 0 ...--ec554aeafe75601aaab43bd4621a22284db566c2 | 0 .../cli}/tests/fixtures/keystore/password | 0 .../tests/fixtures/keystore/password-ec554 | 0 ...y_once_with_changed_versions.0.8.10.stdout | 0 ...y_once_with_changed_versions.0.8.13.stdout | 0 .../cli}/tests/fixtures/sign_typed_data.json | 0 .../suggest_when_no_tests_match.stdout | 0 .../cli}/tests/fixtures/warn_no_tests.stdout | 0 .../tests/fixtures/warn_no_tests_match.stdout | 0 {cli => crates/cli}/tests/it/cache.rs | 0 {cli => crates/cli}/tests/it/cast.rs | 0 {cli => crates/cli}/tests/it/cmd.rs | 0 {cli => crates/cli}/tests/it/config.rs | 0 {cli => crates/cli}/tests/it/constants.rs | 0 {cli => crates/cli}/tests/it/create.rs | 0 {cli => crates/cli}/tests/it/doc.rs | 0 {cli => crates/cli}/tests/it/integration.rs | 0 {cli => crates/cli}/tests/it/main.rs | 0 {cli => crates/cli}/tests/it/multi_script.rs | 0 {cli => crates/cli}/tests/it/script.rs | 10 +- {cli => crates/cli}/tests/it/svm.rs | 0 {cli => crates/cli}/tests/it/test_cmd.rs | 0 {cli => crates/cli}/tests/it/utils.rs | 0 {cli => crates/cli}/tests/it/verify.rs | 0 {cli => crates/cli}/tests/rpc-cache-keyfile | 0 {common => crates/common}/Cargo.toml | 0 {common => crates/common}/README.md | 0 {common => crates/common}/src/abi.rs | 0 {common => crates/common}/src/calc.rs | 0 {common => crates/common}/src/clap_helpers.rs | 0 {common => crates/common}/src/compile.rs | 0 {common => crates/common}/src/constants.rs | 0 {common => crates/common}/src/contracts.rs | 0 .../common}/src/errors/artifacts.rs | 0 {common => crates/common}/src/errors/fs.rs | 0 {common => crates/common}/src/errors/mod.rs | 0 {common => crates/common}/src/evm.rs | 0 {common => crates/common}/src/fmt.rs | 0 {common => crates/common}/src/fs.rs | 0 {common => crates/common}/src/glob.rs | 0 {common => crates/common}/src/lib.rs | 0 {common => crates/common}/src/provider.rs | 0 {common => crates/common}/src/selectors.rs | 0 {common => crates/common}/src/shell.rs | 0 {common => crates/common}/src/term.rs | 0 {common => crates/common}/src/traits.rs | 0 {common => crates/common}/src/transactions.rs | 0 {config => crates/config}/Cargo.toml | 0 {config => crates/config}/README.md | 0 {config => crates/config}/src/cache.rs | 0 {config => crates/config}/src/chain.rs | 0 {config => crates/config}/src/doc.rs | 0 {config => crates/config}/src/endpoints.rs | 0 {config => crates/config}/src/error.rs | 0 {config => crates/config}/src/etherscan.rs | 0 {config => crates/config}/src/fix.rs | 0 {config => crates/config}/src/fmt.rs | 0 .../config}/src/fs_permissions.rs | 0 {config => crates/config}/src/fuzz.rs | 0 .../config}/src/inline/conf_parser.rs | 0 {config => crates/config}/src/inline/mod.rs | 0 .../config}/src/inline/natspec.rs | 0 {config => crates/config}/src/invariant.rs | 0 {config => crates/config}/src/lib.rs | 0 {config => crates/config}/src/macros.rs | 0 .../config}/src/providers/mod.rs | 0 .../config}/src/providers/remappings.rs | 0 {config => crates/config}/src/resolve.rs | 0 {config => crates/config}/src/utils.rs | 0 {config => crates/config}/src/warning.rs | 0 {doc => crates/doc}/Cargo.toml | 0 {doc => crates/doc}/README.md | 0 {doc => crates/doc}/src/builder.rs | 0 {doc => crates/doc}/src/document.rs | 0 {doc => crates/doc}/src/helpers.rs | 0 {doc => crates/doc}/src/lib.rs | 0 {doc => crates/doc}/src/parser/comment.rs | 0 {doc => crates/doc}/src/parser/error.rs | 0 {doc => crates/doc}/src/parser/item.rs | 0 {doc => crates/doc}/src/parser/mod.rs | 0 .../src/preprocessor/contract_inheritance.rs | 0 .../doc}/src/preprocessor/deployments.rs | 0 .../doc}/src/preprocessor/git_source.rs | 0 .../doc}/src/preprocessor/inheritdoc.rs | 0 {doc => crates/doc}/src/preprocessor/mod.rs | 0 {doc => crates/doc}/src/server.rs | 0 {doc => crates/doc}/src/writer/as_doc.rs | 0 {doc => crates/doc}/src/writer/buf_writer.rs | 0 {doc => crates/doc}/src/writer/markdown.rs | 0 {doc => crates/doc}/src/writer/mod.rs | 0 {doc => crates/doc}/static/book.css | 0 {doc => crates/doc}/static/book.toml | 0 {doc => crates/doc}/static/solidity.min.js | 0 {evm => crates/evm}/Cargo.toml | 0 {evm => crates/evm}/src/coverage/analysis.rs | 0 {evm => crates/evm}/src/coverage/anchors.rs | 0 {evm => crates/evm}/src/coverage/mod.rs | 0 {evm => crates/evm}/src/debug.rs | 0 {evm => crates/evm}/src/decode.rs | 0 {evm => crates/evm}/src/executor/abi/mod.rs | 0 .../evm}/src/executor/backend/diagnostic.rs | 0 .../evm}/src/executor/backend/error.rs | 0 .../evm}/src/executor/backend/fuzz.rs | 0 .../evm}/src/executor/backend/in_memory_db.rs | 0 .../evm}/src/executor/backend/mod.rs | 0 .../evm}/src/executor/backend/snapshot.rs | 0 {evm => crates/evm}/src/executor/builder.rs | 0 .../evm}/src/executor/fork/backend.rs | 0 .../evm}/src/executor/fork/cache.rs | 0 .../evm}/src/executor/fork/database.rs | 0 {evm => crates/evm}/src/executor/fork/init.rs | 0 {evm => crates/evm}/src/executor/fork/mod.rs | 0 .../evm}/src/executor/fork/multi.rs | 0 .../src/executor/inspector/access_list.rs | 0 .../executor/inspector/cheatcodes/config.rs | 0 .../src/executor/inspector/cheatcodes/env.rs | 0 .../executor/inspector/cheatcodes/error.rs | 0 .../executor/inspector/cheatcodes/expect.rs | 0 .../src/executor/inspector/cheatcodes/ext.rs | 0 .../src/executor/inspector/cheatcodes/fork.rs | 0 .../src/executor/inspector/cheatcodes/fs.rs | 0 .../src/executor/inspector/cheatcodes/fuzz.rs | 0 .../executor/inspector/cheatcodes/mapping.rs | 0 .../src/executor/inspector/cheatcodes/mod.rs | 0 .../executor/inspector/cheatcodes/snapshot.rs | 0 .../src/executor/inspector/cheatcodes/util.rs | 0 .../src/executor/inspector/chisel_state.rs | 0 .../evm}/src/executor/inspector/coverage.rs | 0 .../evm}/src/executor/inspector/debugger.rs | 0 .../evm}/src/executor/inspector/fuzzer.rs | 0 .../evm}/src/executor/inspector/logs.rs | 0 .../evm}/src/executor/inspector/mod.rs | 0 .../evm}/src/executor/inspector/printer.rs | 0 .../evm}/src/executor/inspector/stack.rs | 0 .../evm}/src/executor/inspector/tracer.rs | 0 .../evm}/src/executor/inspector/utils.rs | 0 {evm => crates/evm}/src/executor/mod.rs | 0 {evm => crates/evm}/src/executor/opts.rs | 0 {evm => crates/evm}/src/executor/snapshot.rs | 0 {evm => crates/evm}/src/fuzz/error.rs | 0 .../evm}/src/fuzz/invariant/call_override.rs | 0 .../evm}/src/fuzz/invariant/error.rs | 0 .../evm}/src/fuzz/invariant/executor.rs | 0 .../evm}/src/fuzz/invariant/filters.rs | 0 {evm => crates/evm}/src/fuzz/invariant/mod.rs | 0 {evm => crates/evm}/src/fuzz/mod.rs | 0 .../evm}/src/fuzz/strategies/calldata.rs | 0 .../evm}/src/fuzz/strategies/int.rs | 0 .../evm}/src/fuzz/strategies/invariants.rs | 0 .../evm}/src/fuzz/strategies/mod.rs | 0 .../evm}/src/fuzz/strategies/param.rs | 0 .../evm}/src/fuzz/strategies/state.rs | 0 .../evm}/src/fuzz/strategies/uint.rs | 0 {evm => crates/evm}/src/lib.rs | 0 {evm => crates/evm}/src/trace/decoder.rs | 0 {evm => crates/evm}/src/trace/executor.rs | 0 .../evm}/src/trace/identifier/etherscan.rs | 0 .../evm}/src/trace/identifier/local.rs | 0 .../evm}/src/trace/identifier/mod.rs | 0 .../evm}/src/trace/identifier/signatures.rs | 0 {evm => crates/evm}/src/trace/mod.rs | 0 {evm => crates/evm}/src/trace/node.rs | 0 {evm => crates/evm}/src/trace/utils.rs | 0 {evm => crates/evm}/src/utils.rs | 0 {evm => crates/evm}/test-data/solc-obj.json | 0 {evm => crates/evm}/test-data/storage.json | 0 {fmt => crates/fmt}/Cargo.toml | 0 {fmt => crates/fmt}/README.md | 0 {fmt => crates/fmt}/src/buffer.rs | 0 {fmt => crates/fmt}/src/chunk.rs | 0 {fmt => crates/fmt}/src/comments.rs | 0 {fmt => crates/fmt}/src/formatter.rs | 0 {fmt => crates/fmt}/src/helpers.rs | 0 {fmt => crates/fmt}/src/inline_config.rs | 0 {fmt => crates/fmt}/src/lib.rs | 0 {fmt => crates/fmt}/src/macros.rs | 0 {fmt => crates/fmt}/src/solang_ext/ast_eq.rs | 0 {fmt => crates/fmt}/src/solang_ext/loc.rs | 0 {fmt => crates/fmt}/src/solang_ext/mod.rs | 0 .../fmt}/src/solang_ext/safe_unwrap.rs | 0 {fmt => crates/fmt}/src/string.rs | 0 {fmt => crates/fmt}/src/visit.rs | 0 .../fmt}/testdata/Annotation/fmt.sol | 0 .../fmt}/testdata/Annotation/original.sol | 0 .../fmt}/testdata/ArrayExpressions/fmt.sol | 0 .../testdata/ArrayExpressions/original.sol | 0 .../ConditionalOperatorExpression/fmt.sol | 0 .../original.sol | 0 .../testdata/ConstructorDefinition/fmt.sol | 0 .../ConstructorDefinition/original.sol | 0 .../bracket-spacing.fmt.sol | 0 .../contract-new-lines.fmt.sol | 0 .../fmt}/testdata/ContractDefinition/fmt.sol | 0 .../testdata/ContractDefinition/original.sol | 0 .../fmt}/testdata/DoWhileStatement/fmt.sol | 0 .../testdata/DoWhileStatement/original.sol | 0 .../fmt}/testdata/DocComments/fmt.sol | 0 .../fmt}/testdata/DocComments/original.sol | 0 .../DocComments/wrap-comments.fmt.sol | 0 .../fmt}/testdata/EmitStatement/fmt.sol | 0 .../fmt}/testdata/EmitStatement/original.sol | 0 .../EnumDefinition/bracket-spacing.fmt.sol | 0 .../fmt}/testdata/EnumDefinition/fmt.sol | 0 .../fmt}/testdata/EnumDefinition/original.sol | 0 .../fmt}/testdata/ErrorDefinition/fmt.sol | 0 .../testdata/ErrorDefinition/original.sol | 0 .../fmt}/testdata/EventDefinition/fmt.sol | 0 .../testdata/EventDefinition/original.sol | 0 .../fmt}/testdata/ForStatement/fmt.sol | 0 .../fmt}/testdata/ForStatement/original.sol | 0 .../FunctionCall/bracket-spacing.fmt.sol | 0 .../fmt}/testdata/FunctionCall/fmt.sol | 0 .../fmt}/testdata/FunctionCall/original.sol | 0 .../bracket-spacing.fmt.sol | 0 .../FunctionCallArgsStatement/fmt.sol | 0 .../FunctionCallArgsStatement/original.sol | 0 .../testdata/FunctionDefinition/all.fmt.sol | 0 .../fmt}/testdata/FunctionDefinition/fmt.sol | 0 .../testdata/FunctionDefinition/original.sol | 0 .../override-spacing.fmt.sol | 0 .../FunctionDefinition/params-first.fmt.sol | 0 .../fmt}/testdata/FunctionType/fmt.sol | 0 .../fmt}/testdata/FunctionType/original.sol | 0 .../testdata/IfStatement/block-multi.fmt.sol | 0 .../testdata/IfStatement/block-single.fmt.sol | 0 .../fmt}/testdata/IfStatement/fmt.sol | 0 .../fmt}/testdata/IfStatement/original.sol | 0 .../fmt}/testdata/IfStatement2/fmt.sol | 0 .../fmt}/testdata/IfStatement2/original.sol | 0 .../ImportDirective/bracket-spacing.fmt.sol | 0 .../fmt}/testdata/ImportDirective/fmt.sol | 0 .../testdata/ImportDirective/original.sol | 0 .../ImportDirective/preserve-quote.fmt.sol | 0 .../ImportDirective/single-quote.fmt.sol | 0 .../fmt}/testdata/InlineDisable/fmt.sol | 0 .../fmt}/testdata/InlineDisable/original.sol | 0 {fmt => crates/fmt}/testdata/IntTypes/fmt.sol | 0 .../fmt}/testdata/IntTypes/original.sol | 0 .../fmt}/testdata/IntTypes/preserve.fmt.sol | 0 .../fmt}/testdata/IntTypes/short.fmt.sol | 0 .../fmt}/testdata/LiteralExpression/fmt.sol | 0 .../testdata/LiteralExpression/original.sol | 0 .../LiteralExpression/preserve-quote.fmt.sol | 0 .../LiteralExpression/single-quote.fmt.sol | 0 .../fmt}/testdata/MappingType/fmt.sol | 0 .../fmt}/testdata/MappingType/original.sol | 0 .../fmt}/testdata/ModifierDefinition/fmt.sol | 0 .../testdata/ModifierDefinition/original.sol | 0 .../override-spacing.fmt.sol | 0 .../NamedFunctionCallExpression/fmt.sol | 0 .../NamedFunctionCallExpression/original.sol | 0 .../testdata/NumberLiteralUnderscore/fmt.sol | 0 .../NumberLiteralUnderscore/original.sol | 0 .../NumberLiteralUnderscore/remove.fmt.sol | 0 .../NumberLiteralUnderscore/thousands.fmt.sol | 0 .../fmt}/testdata/OperatorExpressions/fmt.sol | 0 .../testdata/OperatorExpressions/original.sol | 0 .../fmt}/testdata/PragmaDirective/fmt.sol | 0 .../testdata/PragmaDirective/original.sol | 0 {fmt => crates/fmt}/testdata/Repros/fmt.sol | 0 .../fmt}/testdata/Repros/original.sol | 0 .../fmt}/testdata/ReturnStatement/fmt.sol | 0 .../testdata/ReturnStatement/original.sol | 0 .../testdata/RevertNamedArgsStatement/fmt.sol | 0 .../RevertNamedArgsStatement/original.sol | 0 .../fmt}/testdata/RevertStatement/fmt.sol | 0 .../testdata/RevertStatement/original.sol | 0 .../fmt}/testdata/SimpleComments/fmt.sol | 0 .../fmt}/testdata/SimpleComments/original.sol | 0 .../SimpleComments/wrap-comments.fmt.sol | 0 .../StatementBlock/bracket-spacing.fmt.sol | 0 .../fmt}/testdata/StatementBlock/fmt.sol | 0 .../fmt}/testdata/StatementBlock/original.sol | 0 .../StructDefinition/bracket-spacing.fmt.sol | 0 .../fmt}/testdata/StructDefinition/fmt.sol | 0 .../testdata/StructDefinition/original.sol | 0 .../fmt}/testdata/ThisExpression/fmt.sol | 0 .../fmt}/testdata/ThisExpression/original.sol | 0 .../fmt}/testdata/TrailingComma/fmt.sol | 0 .../fmt}/testdata/TrailingComma/original.sol | 0 .../fmt}/testdata/TryStatement/fmt.sol | 0 .../fmt}/testdata/TryStatement/original.sol | 0 .../fmt}/testdata/TypeDefinition/fmt.sol | 0 .../fmt}/testdata/TypeDefinition/original.sol | 0 .../fmt}/testdata/UnitExpression/fmt.sol | 0 .../fmt}/testdata/UnitExpression/original.sol | 0 .../fmt}/testdata/UsingDirective/fmt.sol | 0 .../fmt}/testdata/UsingDirective/original.sol | 0 .../bracket-spacing.fmt.sol | 0 .../fmt}/testdata/VariableAssignment/fmt.sol | 0 .../testdata/VariableAssignment/original.sol | 0 .../fmt}/testdata/VariableDefinition/fmt.sol | 0 .../testdata/VariableDefinition/original.sol | 0 .../override-spacing.fmt.sol | 0 .../WhileStatement/block-multi.fmt.sol | 0 .../WhileStatement/block-single.fmt.sol | 0 .../fmt}/testdata/WhileStatement/fmt.sol | 0 .../fmt}/testdata/WhileStatement/original.sol | 0 {fmt => crates/fmt}/testdata/Yul/fmt.sol | 0 {fmt => crates/fmt}/testdata/Yul/original.sol | 0 .../fmt}/testdata/YulStrings/fmt.sol | 0 .../fmt}/testdata/YulStrings/original.sol | 0 .../YulStrings/preserve-quote.fmt.sol | 0 .../testdata/YulStrings/single-quote.fmt.sol | 0 {fmt => crates/fmt}/tests/it/formatter.rs | 0 {fmt => crates/fmt}/tests/it/main.rs | 0 {forge => crates/forge}/Cargo.toml | 0 {forge => crates/forge}/README.md | 0 {forge => crates/forge}/src/coverage.rs | 0 {forge => crates/forge}/src/gas_report.rs | 0 {forge => crates/forge}/src/lib.rs | 0 {forge => crates/forge}/src/multi_runner.rs | 0 {forge => crates/forge}/src/result.rs | 0 {forge => crates/forge}/src/runner.rs | 0 {forge => crates/forge}/tests/it/cheats.rs | 0 {forge => crates/forge}/tests/it/config.rs | 0 {forge => crates/forge}/tests/it/core.rs | 0 {forge => crates/forge}/tests/it/fork.rs | 0 {forge => crates/forge}/tests/it/fs.rs | 0 {forge => crates/forge}/tests/it/fuzz.rs | 0 crates/forge/tests/it/inline.rs | 110 +++++++++++++++++ {forge => crates/forge}/tests/it/invariant.rs | 0 {forge => crates/forge}/tests/it/main.rs | 0 {forge => crates/forge}/tests/it/repros.rs | 0 {forge => crates/forge}/tests/it/spec.rs | 0 .../forge}/tests/it/test_helpers.rs | 4 +- {macros => crates/macros}/Cargo.toml | 0 {macros => crates/macros}/impl/Cargo.toml | 0 .../macros}/impl/src/console_fmt.rs | 0 {macros => crates/macros}/impl/src/lib.rs | 0 {macros => crates/macros}/impl/src/utils.rs | 0 .../macros}/src/fmt/console_fmt.rs | 0 {macros => crates/macros}/src/fmt/mod.rs | 0 {macros => crates/macros}/src/fmt/token.rs | 0 {macros => crates/macros}/src/fmt/ui.rs | 0 {macros => crates/macros}/src/lib.rs | 0 {ui => crates/ui}/Cargo.toml | 0 {ui => crates/ui}/src/lib.rs | 0 {ui => crates/ui}/src/op_effects.rs | 0 {utils => crates/utils}/Cargo.toml | 0 {utils => crates/utils}/README.md | 0 {utils => crates/utils}/src/abi.rs | 26 ++-- {utils => crates/utils}/src/error.rs | 0 {utils => crates/utils}/src/glob.rs | 0 {utils => crates/utils}/src/lib.rs | 10 +- {utils => crates/utils}/src/path.rs | 0 {utils => crates/utils}/src/rpc.rs | 0 forge/tests/it/inline.rs | 114 ------------------ rustfmt.toml | 2 +- testdata/cheats/Derive.t.sol | 4 +- testdata/cheats/Fs.t.sol | 22 ++-- testdata/cheats/GetCode.t.sol | 6 +- testdata/cheats/GetDeployedCode.t.sol | 4 +- testdata/cheats/Json.t.sol | 16 +-- testdata/fs/Default.t.sol | 12 +- testdata/fs/Disabled.t.sol | 14 +-- testdata/repros/Issue4630.t.sol | 4 +- 628 files changed, 204 insertions(+), 204 deletions(-) rename {abi => crates/abi}/Cargo.toml (100%) rename {abi => crates/abi}/README.md (100%) rename {abi => crates/abi}/abi/Console.sol (100%) rename {abi => crates/abi}/abi/HEVM.sol (100%) rename {abi => crates/abi}/abi/HardhatConsole.json (100%) rename {abi => crates/abi}/build.rs (100%) rename {abi => crates/abi}/src/bindings/console.rs (100%) rename {abi => crates/abi}/src/bindings/hardhat_console.rs (100%) rename {abi => crates/abi}/src/bindings/hevm.rs (100%) rename {abi => crates/abi}/src/bindings/mod.rs (100%) rename {abi => crates/abi}/src/lib.rs (100%) rename {anvil => crates/anvil}/Cargo.toml (100%) rename {anvil => crates/anvil}/README.md (100%) rename {anvil => crates/anvil}/build.rs (100%) rename {anvil => crates/anvil}/core/Cargo.toml (100%) rename {anvil => crates/anvil}/core/src/eth/block.rs (100%) rename {anvil => crates/anvil}/core/src/eth/mod.rs (100%) rename {anvil => crates/anvil}/core/src/eth/proof.rs (100%) rename {anvil => crates/anvil}/core/src/eth/receipt.rs (100%) rename {anvil => crates/anvil}/core/src/eth/serde_helpers.rs (100%) rename {anvil => crates/anvil}/core/src/eth/state.rs (100%) rename {anvil => crates/anvil}/core/src/eth/subscription.rs (100%) rename {anvil => crates/anvil}/core/src/eth/transaction/ethers_compat.rs (100%) rename {anvil => crates/anvil}/core/src/eth/transaction/mod.rs (100%) rename {anvil => crates/anvil}/core/src/eth/trie.rs (100%) rename {anvil => crates/anvil}/core/src/eth/utils.rs (100%) rename {anvil => crates/anvil}/core/src/lib.rs (100%) rename {anvil => crates/anvil}/core/src/types.rs (100%) rename {anvil => crates/anvil}/rpc/Cargo.toml (100%) rename {anvil => crates/anvil}/rpc/src/error.rs (100%) rename {anvil => crates/anvil}/rpc/src/lib.rs (100%) rename {anvil => crates/anvil}/rpc/src/request.rs (100%) rename {anvil => crates/anvil}/rpc/src/response.rs (100%) rename {anvil => crates/anvil}/server/Cargo.toml (100%) rename {anvil => crates/anvil}/server/src/config.rs (100%) rename {anvil => crates/anvil}/server/src/error.rs (100%) rename {anvil => crates/anvil}/server/src/handler.rs (100%) rename {anvil => crates/anvil}/server/src/ipc.rs (100%) rename {anvil => crates/anvil}/server/src/lib.rs (100%) rename {anvil => crates/anvil}/server/src/pubsub.rs (100%) rename {anvil => crates/anvil}/server/src/ws.rs (100%) rename {anvil => crates/anvil}/src/anvil.rs (100%) rename {anvil => crates/anvil}/src/cmd.rs (100%) rename {anvil => crates/anvil}/src/config.rs (100%) rename {anvil => crates/anvil}/src/eth/api.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/cheats.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/db.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/executor.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/fork.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/genesis.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/info.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/cache.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/fork_db.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/in_memory_db.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/inspector.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/mod.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/state.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mem/storage.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/mod.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/notifications.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/time.rs (100%) rename {anvil => crates/anvil}/src/eth/backend/validate.rs (100%) rename {anvil => crates/anvil}/src/eth/error.rs (100%) rename {anvil => crates/anvil}/src/eth/fees.rs (100%) rename {anvil => crates/anvil}/src/eth/macros.rs (100%) rename {anvil => crates/anvil}/src/eth/miner.rs (100%) rename {anvil => crates/anvil}/src/eth/mod.rs (100%) rename {anvil => crates/anvil}/src/eth/otterscan/api.rs (100%) rename {anvil => crates/anvil}/src/eth/otterscan/mod.rs (100%) rename {anvil => crates/anvil}/src/eth/otterscan/types.rs (100%) rename {anvil => crates/anvil}/src/eth/pool/mod.rs (100%) rename {anvil => crates/anvil}/src/eth/pool/transactions.rs (100%) rename {anvil => crates/anvil}/src/eth/sign.rs (100%) rename {anvil => crates/anvil}/src/eth/util.rs (100%) rename {anvil => crates/anvil}/src/filter.rs (100%) rename {anvil => crates/anvil}/src/genesis.rs (100%) rename {anvil => crates/anvil}/src/hardfork.rs (100%) rename {anvil => crates/anvil}/src/lib.rs (100%) rename {anvil => crates/anvil}/src/logging.rs (100%) rename {anvil => crates/anvil}/src/pubsub.rs (100%) rename {anvil => crates/anvil}/src/server/error.rs (100%) rename {anvil => crates/anvil}/src/server/handler.rs (100%) rename {anvil => crates/anvil}/src/server/mod.rs (100%) rename {anvil => crates/anvil}/src/service.rs (100%) rename {anvil => crates/anvil}/src/shutdown.rs (100%) rename {anvil => crates/anvil}/src/tasks/block_listener.rs (100%) rename {anvil => crates/anvil}/src/tasks/mod.rs (100%) rename {anvil => crates/anvil}/test-data/SimpleStorage.json (100%) rename {anvil => crates/anvil}/test-data/SimpleStorage.sol (100%) rename {anvil => crates/anvil}/test-data/emit_logs.json (100%) rename {anvil => crates/anvil}/test-data/emit_logs.sol (100%) rename {anvil => crates/anvil}/test-data/greeter.json (100%) rename {anvil => crates/anvil}/test-data/multicall.json (100%) rename {anvil => crates/anvil}/test-data/multicall.sol (100%) rename {anvil => crates/anvil}/tests/it/abi.rs (100%) rename {anvil => crates/anvil}/tests/it/anvil.rs (100%) rename {anvil => crates/anvil}/tests/it/anvil_api.rs (100%) rename {anvil => crates/anvil}/tests/it/api.rs (100%) rename {anvil => crates/anvil}/tests/it/fork.rs (100%) rename {anvil => crates/anvil}/tests/it/ganache.rs (100%) rename {anvil => crates/anvil}/tests/it/gas.rs (100%) rename {anvil => crates/anvil}/tests/it/genesis.rs (100%) rename {anvil => crates/anvil}/tests/it/geth.rs (100%) rename {anvil => crates/anvil}/tests/it/ipc.rs (100%) rename {anvil => crates/anvil}/tests/it/logs.rs (100%) rename {anvil => crates/anvil}/tests/it/main.rs (100%) rename {anvil => crates/anvil}/tests/it/otterscan.rs (100%) rename {anvil => crates/anvil}/tests/it/proof/eip1186.rs (100%) rename {anvil => crates/anvil}/tests/it/proof/mod.rs (100%) rename {anvil => crates/anvil}/tests/it/pubsub.rs (100%) rename {anvil => crates/anvil}/tests/it/revert.rs (100%) rename {anvil => crates/anvil}/tests/it/sign.rs (100%) rename {anvil => crates/anvil}/tests/it/traces.rs (100%) rename {anvil => crates/anvil}/tests/it/transaction.rs (100%) rename {anvil => crates/anvil}/tests/it/txpool.rs (100%) rename {anvil => crates/anvil}/tests/it/utils.rs (100%) rename {anvil => crates/anvil}/tests/it/wsapi.rs (100%) rename {binder => crates/binder}/Cargo.toml (100%) rename {binder => crates/binder}/README.md (100%) rename {binder => crates/binder}/src/lib.rs (100%) rename {binder => crates/binder}/src/utils.rs (100%) rename {cast => crates/cast}/Cargo.toml (100%) rename {cast => crates/cast}/README.md (100%) rename {cast => crates/cast}/src/base.rs (100%) rename {cast => crates/cast}/src/errors.rs (100%) rename {cast => crates/cast}/src/lib.rs (100%) rename {cast => crates/cast}/src/rlp_converter.rs (100%) rename {cast => crates/cast}/src/tx.rs (100%) rename {chisel => crates/chisel}/Cargo.toml (100%) rename {chisel => crates/chisel}/README.md (100%) rename {chisel => crates/chisel}/assets/preview.gif (100%) rename {chisel => crates/chisel}/assets/preview.tape (100%) rename {chisel => crates/chisel}/benches/session_source.rs (100%) rename {chisel => crates/chisel}/build.rs (100%) rename {chisel => crates/chisel}/src/bin/chisel.rs (100%) rename {chisel => crates/chisel}/src/cmd.rs (100%) rename {chisel => crates/chisel}/src/dispatcher.rs (100%) rename {chisel => crates/chisel}/src/executor.rs (100%) rename {chisel => crates/chisel}/src/history.rs (100%) rename {chisel => crates/chisel}/src/lib.rs (100%) rename {chisel => crates/chisel}/src/runner.rs (100%) rename {chisel => crates/chisel}/src/session.rs (100%) rename {chisel => crates/chisel}/src/session_source.rs (99%) rename {chisel => crates/chisel}/src/solidity_helper.rs (100%) rename {chisel => crates/chisel}/tests/cache.rs (100%) rename {cli => crates/cli}/Cargo.toml (100%) rename {cli => crates/cli}/README.md (100%) rename {cli => crates/cli}/assets/.gitignoreTemplate (100%) rename {cli => crates/cli}/assets/CounterTemplate.s.sol (100%) rename {cli => crates/cli}/assets/CounterTemplate.sol (100%) rename {cli => crates/cli}/assets/CounterTemplate.t.sol (100%) rename {cli => crates/cli}/assets/README.md (100%) rename {cli => crates/cli}/assets/generated/TestTemplate.t.sol (100%) rename {cli => crates/cli}/assets/workflowTemplate.yml (100%) rename {cli => crates/cli}/benches/cast.rs (100%) rename {cli => crates/cli}/benches/forge_test.rs (100%) rename {cli => crates/cli}/build.rs (100%) rename {cli => crates/cli}/src/cast/cmd/access_list.rs (100%) rename {cli => crates/cli}/src/cast/cmd/bind.rs (100%) rename {cli => crates/cli}/src/cast/cmd/call.rs (100%) rename {cli => crates/cli}/src/cast/cmd/create2.rs (100%) rename {cli => crates/cli}/src/cast/cmd/estimate.rs (100%) rename {cli => crates/cli}/src/cast/cmd/find_block.rs (100%) rename {cli => crates/cli}/src/cast/cmd/interface.rs (100%) rename {cli => crates/cli}/src/cast/cmd/logs.rs (100%) rename {cli => crates/cli}/src/cast/cmd/mod.rs (100%) rename {cli => crates/cli}/src/cast/cmd/rpc.rs (100%) rename {cli => crates/cli}/src/cast/cmd/run.rs (100%) rename {cli => crates/cli}/src/cast/cmd/send.rs (100%) rename {cli => crates/cli}/src/cast/cmd/storage.rs (100%) rename {cli => crates/cli}/src/cast/cmd/wallet/mod.rs (100%) rename {cli => crates/cli}/src/cast/cmd/wallet/vanity.rs (100%) rename {cli => crates/cli}/src/cast/main.rs (100%) rename {cli => crates/cli}/src/cast/opts.rs (100%) rename {cli => crates/cli}/src/forge/cmd/bind.rs (100%) rename {cli => crates/cli}/src/forge/cmd/build.rs (100%) rename {cli => crates/cli}/src/forge/cmd/cache.rs (100%) rename {cli => crates/cli}/src/forge/cmd/config.rs (100%) rename {cli => crates/cli}/src/forge/cmd/coverage.rs (100%) rename {cli => crates/cli}/src/forge/cmd/create.rs (100%) rename {cli => crates/cli}/src/forge/cmd/debug.rs (100%) rename {cli => crates/cli}/src/forge/cmd/doc.rs (100%) rename {cli => crates/cli}/src/forge/cmd/flatten.rs (100%) rename {cli => crates/cli}/src/forge/cmd/fmt.rs (100%) rename {cli => crates/cli}/src/forge/cmd/fourbyte.rs (100%) rename {cli => crates/cli}/src/forge/cmd/geiger/error.rs (100%) rename {cli => crates/cli}/src/forge/cmd/geiger/find.rs (100%) rename {cli => crates/cli}/src/forge/cmd/geiger/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/geiger/visitor.rs (100%) rename {cli => crates/cli}/src/forge/cmd/generate/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/init.rs (100%) rename {cli => crates/cli}/src/forge/cmd/inspect.rs (100%) rename {cli => crates/cli}/src/forge/cmd/install.rs (100%) rename {cli => crates/cli}/src/forge/cmd/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/remappings.rs (100%) rename {cli => crates/cli}/src/forge/cmd/remove.rs (100%) rename {cli => crates/cli}/src/forge/cmd/retry.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/artifacts.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/broadcast.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/build.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/cmd.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/executor.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/multi.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/providers.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/receipts.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/runner.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/sequence.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/transaction.rs (100%) rename {cli => crates/cli}/src/forge/cmd/script/verify.rs (100%) rename {cli => crates/cli}/src/forge/cmd/selectors.rs (100%) rename {cli => crates/cli}/src/forge/cmd/snapshot.rs (100%) rename {cli => crates/cli}/src/forge/cmd/test/filter.rs (100%) rename {cli => crates/cli}/src/forge/cmd/test/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/tree.rs (100%) rename {cli => crates/cli}/src/forge/cmd/update.rs (100%) rename {cli => crates/cli}/src/forge/cmd/verify/etherscan/flatten.rs (100%) rename {cli => crates/cli}/src/forge/cmd/verify/etherscan/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/verify/etherscan/standard_json.rs (100%) rename {cli => crates/cli}/src/forge/cmd/verify/mod.rs (100%) rename {cli => crates/cli}/src/forge/cmd/verify/provider.rs (100%) rename {cli => crates/cli}/src/forge/cmd/verify/sourcify.rs (100%) rename {cli => crates/cli}/src/forge/cmd/watch.rs (100%) rename {cli => crates/cli}/src/forge/main.rs (100%) rename {cli => crates/cli}/src/forge/opts.rs (100%) rename {cli => crates/cli}/src/handler.rs (100%) rename {cli => crates/cli}/src/lib.rs (100%) rename {cli => crates/cli}/src/opts/build/core.rs (100%) rename {cli => crates/cli}/src/opts/build/mod.rs (100%) rename {cli => crates/cli}/src/opts/build/paths.rs (100%) rename {cli => crates/cli}/src/opts/chain.rs (100%) rename {cli => crates/cli}/src/opts/dependency.rs (100%) rename {cli => crates/cli}/src/opts/ethereum.rs (100%) rename {cli => crates/cli}/src/opts/mod.rs (100%) rename {cli => crates/cli}/src/opts/transaction.rs (100%) rename {cli => crates/cli}/src/opts/wallet/error.rs (100%) rename {cli => crates/cli}/src/opts/wallet/mod.rs (100%) rename {cli => crates/cli}/src/opts/wallet/multi_wallet.rs (100%) rename {cli => crates/cli}/src/stdin.rs (100%) rename {cli => crates/cli}/src/utils/cmd.rs (100%) rename {cli => crates/cli}/src/utils/mod.rs (100%) rename {cli => crates/cli}/src/utils/suggestions.rs (100%) rename {cli => crates/cli}/test-utils/Cargo.toml (100%) rename {cli => crates/cli}/test-utils/src/lib.rs (100%) rename {cli => crates/cli}/test-utils/src/macros.rs (100%) rename {cli => crates/cli}/test-utils/src/script.rs (99%) rename {cli => crates/cli}/test-utils/src/util.rs (99%) rename {cli => crates/cli}/tests/fixtures/ERC20Artifact.json (100%) rename {cli => crates/cli}/tests/fixtures/ScriptVerify.sol (100%) rename {cli => crates/cli}/tests/fixtures/can_build_skip_contracts.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_build_skip_glob.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_check_snapshot.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_create_template_contract-2nd.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_create_template_contract.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_create_using_unlocked-2nd.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_create_using_unlocked.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_detect_dirty_git_status_on_init.stderr (100%) rename {cli => crates/cli}/tests/fixtures/can_execute_script_and_skip_contracts.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_execute_script_command.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_execute_script_command_fqn.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_execute_script_command_with_args.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_execute_script_command_with_returned.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_execute_script_command_with_sig.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_run_test_in_custom_test_folder.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_set_yul_optimizer.stderr (100%) rename {cli => crates/cli}/tests/fixtures/can_test_repeatedly.stdout (100%) rename {cli => crates/cli}/tests/fixtures/can_use_libs_in_multi_fork.stdout (100%) rename {cli => crates/cli}/tests/fixtures/cast_logs.stdout (100%) rename {cli => crates/cli}/tests/fixtures/keystore/UTC--2022-10-30T06-51-20.130356000Z--560d246fcddc9ea98a8b032c9a2f474efb493c28 (100%) rename {cli => crates/cli}/tests/fixtures/keystore/UTC--2022-12-20T10-30-43.591916000Z--ec554aeafe75601aaab43bd4621a22284db566c2 (100%) rename {cli => crates/cli}/tests/fixtures/keystore/password (100%) rename {cli => crates/cli}/tests/fixtures/keystore/password-ec554 (100%) rename {cli => crates/cli}/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.10.stdout (100%) rename {cli => crates/cli}/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.13.stdout (100%) rename {cli => crates/cli}/tests/fixtures/sign_typed_data.json (100%) rename {cli => crates/cli}/tests/fixtures/suggest_when_no_tests_match.stdout (100%) rename {cli => crates/cli}/tests/fixtures/warn_no_tests.stdout (100%) rename {cli => crates/cli}/tests/fixtures/warn_no_tests_match.stdout (100%) rename {cli => crates/cli}/tests/it/cache.rs (100%) rename {cli => crates/cli}/tests/it/cast.rs (100%) rename {cli => crates/cli}/tests/it/cmd.rs (100%) rename {cli => crates/cli}/tests/it/config.rs (100%) rename {cli => crates/cli}/tests/it/constants.rs (100%) rename {cli => crates/cli}/tests/it/create.rs (100%) rename {cli => crates/cli}/tests/it/doc.rs (100%) rename {cli => crates/cli}/tests/it/integration.rs (100%) rename {cli => crates/cli}/tests/it/main.rs (100%) rename {cli => crates/cli}/tests/it/multi_script.rs (100%) rename {cli => crates/cli}/tests/it/script.rs (99%) rename {cli => crates/cli}/tests/it/svm.rs (100%) rename {cli => crates/cli}/tests/it/test_cmd.rs (100%) rename {cli => crates/cli}/tests/it/utils.rs (100%) rename {cli => crates/cli}/tests/it/verify.rs (100%) rename {cli => crates/cli}/tests/rpc-cache-keyfile (100%) rename {common => crates/common}/Cargo.toml (100%) rename {common => crates/common}/README.md (100%) rename {common => crates/common}/src/abi.rs (100%) rename {common => crates/common}/src/calc.rs (100%) rename {common => crates/common}/src/clap_helpers.rs (100%) rename {common => crates/common}/src/compile.rs (100%) rename {common => crates/common}/src/constants.rs (100%) rename {common => crates/common}/src/contracts.rs (100%) rename {common => crates/common}/src/errors/artifacts.rs (100%) rename {common => crates/common}/src/errors/fs.rs (100%) rename {common => crates/common}/src/errors/mod.rs (100%) rename {common => crates/common}/src/evm.rs (100%) rename {common => crates/common}/src/fmt.rs (100%) rename {common => crates/common}/src/fs.rs (100%) rename {common => crates/common}/src/glob.rs (100%) rename {common => crates/common}/src/lib.rs (100%) rename {common => crates/common}/src/provider.rs (100%) rename {common => crates/common}/src/selectors.rs (100%) rename {common => crates/common}/src/shell.rs (100%) rename {common => crates/common}/src/term.rs (100%) rename {common => crates/common}/src/traits.rs (100%) rename {common => crates/common}/src/transactions.rs (100%) rename {config => crates/config}/Cargo.toml (100%) rename {config => crates/config}/README.md (100%) rename {config => crates/config}/src/cache.rs (100%) rename {config => crates/config}/src/chain.rs (100%) rename {config => crates/config}/src/doc.rs (100%) rename {config => crates/config}/src/endpoints.rs (100%) rename {config => crates/config}/src/error.rs (100%) rename {config => crates/config}/src/etherscan.rs (100%) rename {config => crates/config}/src/fix.rs (100%) rename {config => crates/config}/src/fmt.rs (100%) rename {config => crates/config}/src/fs_permissions.rs (100%) rename {config => crates/config}/src/fuzz.rs (100%) rename {config => crates/config}/src/inline/conf_parser.rs (100%) rename {config => crates/config}/src/inline/mod.rs (100%) rename {config => crates/config}/src/inline/natspec.rs (100%) rename {config => crates/config}/src/invariant.rs (100%) rename {config => crates/config}/src/lib.rs (100%) rename {config => crates/config}/src/macros.rs (100%) rename {config => crates/config}/src/providers/mod.rs (100%) rename {config => crates/config}/src/providers/remappings.rs (100%) rename {config => crates/config}/src/resolve.rs (100%) rename {config => crates/config}/src/utils.rs (100%) rename {config => crates/config}/src/warning.rs (100%) rename {doc => crates/doc}/Cargo.toml (100%) rename {doc => crates/doc}/README.md (100%) rename {doc => crates/doc}/src/builder.rs (100%) rename {doc => crates/doc}/src/document.rs (100%) rename {doc => crates/doc}/src/helpers.rs (100%) rename {doc => crates/doc}/src/lib.rs (100%) rename {doc => crates/doc}/src/parser/comment.rs (100%) rename {doc => crates/doc}/src/parser/error.rs (100%) rename {doc => crates/doc}/src/parser/item.rs (100%) rename {doc => crates/doc}/src/parser/mod.rs (100%) rename {doc => crates/doc}/src/preprocessor/contract_inheritance.rs (100%) rename {doc => crates/doc}/src/preprocessor/deployments.rs (100%) rename {doc => crates/doc}/src/preprocessor/git_source.rs (100%) rename {doc => crates/doc}/src/preprocessor/inheritdoc.rs (100%) rename {doc => crates/doc}/src/preprocessor/mod.rs (100%) rename {doc => crates/doc}/src/server.rs (100%) rename {doc => crates/doc}/src/writer/as_doc.rs (100%) rename {doc => crates/doc}/src/writer/buf_writer.rs (100%) rename {doc => crates/doc}/src/writer/markdown.rs (100%) rename {doc => crates/doc}/src/writer/mod.rs (100%) rename {doc => crates/doc}/static/book.css (100%) rename {doc => crates/doc}/static/book.toml (100%) rename {doc => crates/doc}/static/solidity.min.js (100%) rename {evm => crates/evm}/Cargo.toml (100%) rename {evm => crates/evm}/src/coverage/analysis.rs (100%) rename {evm => crates/evm}/src/coverage/anchors.rs (100%) rename {evm => crates/evm}/src/coverage/mod.rs (100%) rename {evm => crates/evm}/src/debug.rs (100%) rename {evm => crates/evm}/src/decode.rs (100%) rename {evm => crates/evm}/src/executor/abi/mod.rs (100%) rename {evm => crates/evm}/src/executor/backend/diagnostic.rs (100%) rename {evm => crates/evm}/src/executor/backend/error.rs (100%) rename {evm => crates/evm}/src/executor/backend/fuzz.rs (100%) rename {evm => crates/evm}/src/executor/backend/in_memory_db.rs (100%) rename {evm => crates/evm}/src/executor/backend/mod.rs (100%) rename {evm => crates/evm}/src/executor/backend/snapshot.rs (100%) rename {evm => crates/evm}/src/executor/builder.rs (100%) rename {evm => crates/evm}/src/executor/fork/backend.rs (100%) rename {evm => crates/evm}/src/executor/fork/cache.rs (100%) rename {evm => crates/evm}/src/executor/fork/database.rs (100%) rename {evm => crates/evm}/src/executor/fork/init.rs (100%) rename {evm => crates/evm}/src/executor/fork/mod.rs (100%) rename {evm => crates/evm}/src/executor/fork/multi.rs (100%) rename {evm => crates/evm}/src/executor/inspector/access_list.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/config.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/env.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/error.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/expect.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/ext.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/fork.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/fs.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/fuzz.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/mapping.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/mod.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/snapshot.rs (100%) rename {evm => crates/evm}/src/executor/inspector/cheatcodes/util.rs (100%) rename {evm => crates/evm}/src/executor/inspector/chisel_state.rs (100%) rename {evm => crates/evm}/src/executor/inspector/coverage.rs (100%) rename {evm => crates/evm}/src/executor/inspector/debugger.rs (100%) rename {evm => crates/evm}/src/executor/inspector/fuzzer.rs (100%) rename {evm => crates/evm}/src/executor/inspector/logs.rs (100%) rename {evm => crates/evm}/src/executor/inspector/mod.rs (100%) rename {evm => crates/evm}/src/executor/inspector/printer.rs (100%) rename {evm => crates/evm}/src/executor/inspector/stack.rs (100%) rename {evm => crates/evm}/src/executor/inspector/tracer.rs (100%) rename {evm => crates/evm}/src/executor/inspector/utils.rs (100%) rename {evm => crates/evm}/src/executor/mod.rs (100%) rename {evm => crates/evm}/src/executor/opts.rs (100%) rename {evm => crates/evm}/src/executor/snapshot.rs (100%) rename {evm => crates/evm}/src/fuzz/error.rs (100%) rename {evm => crates/evm}/src/fuzz/invariant/call_override.rs (100%) rename {evm => crates/evm}/src/fuzz/invariant/error.rs (100%) rename {evm => crates/evm}/src/fuzz/invariant/executor.rs (100%) rename {evm => crates/evm}/src/fuzz/invariant/filters.rs (100%) rename {evm => crates/evm}/src/fuzz/invariant/mod.rs (100%) rename {evm => crates/evm}/src/fuzz/mod.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/calldata.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/int.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/invariants.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/mod.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/param.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/state.rs (100%) rename {evm => crates/evm}/src/fuzz/strategies/uint.rs (100%) rename {evm => crates/evm}/src/lib.rs (100%) rename {evm => crates/evm}/src/trace/decoder.rs (100%) rename {evm => crates/evm}/src/trace/executor.rs (100%) rename {evm => crates/evm}/src/trace/identifier/etherscan.rs (100%) rename {evm => crates/evm}/src/trace/identifier/local.rs (100%) rename {evm => crates/evm}/src/trace/identifier/mod.rs (100%) rename {evm => crates/evm}/src/trace/identifier/signatures.rs (100%) rename {evm => crates/evm}/src/trace/mod.rs (100%) rename {evm => crates/evm}/src/trace/node.rs (100%) rename {evm => crates/evm}/src/trace/utils.rs (100%) rename {evm => crates/evm}/src/utils.rs (100%) rename {evm => crates/evm}/test-data/solc-obj.json (100%) rename {evm => crates/evm}/test-data/storage.json (100%) rename {fmt => crates/fmt}/Cargo.toml (100%) rename {fmt => crates/fmt}/README.md (100%) rename {fmt => crates/fmt}/src/buffer.rs (100%) rename {fmt => crates/fmt}/src/chunk.rs (100%) rename {fmt => crates/fmt}/src/comments.rs (100%) rename {fmt => crates/fmt}/src/formatter.rs (100%) rename {fmt => crates/fmt}/src/helpers.rs (100%) rename {fmt => crates/fmt}/src/inline_config.rs (100%) rename {fmt => crates/fmt}/src/lib.rs (100%) rename {fmt => crates/fmt}/src/macros.rs (100%) rename {fmt => crates/fmt}/src/solang_ext/ast_eq.rs (100%) rename {fmt => crates/fmt}/src/solang_ext/loc.rs (100%) rename {fmt => crates/fmt}/src/solang_ext/mod.rs (100%) rename {fmt => crates/fmt}/src/solang_ext/safe_unwrap.rs (100%) rename {fmt => crates/fmt}/src/string.rs (100%) rename {fmt => crates/fmt}/src/visit.rs (100%) rename {fmt => crates/fmt}/testdata/Annotation/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/Annotation/original.sol (100%) rename {fmt => crates/fmt}/testdata/ArrayExpressions/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ArrayExpressions/original.sol (100%) rename {fmt => crates/fmt}/testdata/ConditionalOperatorExpression/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ConditionalOperatorExpression/original.sol (100%) rename {fmt => crates/fmt}/testdata/ConstructorDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ConstructorDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/ContractDefinition/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ContractDefinition/contract-new-lines.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ContractDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ContractDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/DoWhileStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/DoWhileStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/DocComments/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/DocComments/original.sol (100%) rename {fmt => crates/fmt}/testdata/DocComments/wrap-comments.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/EmitStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/EmitStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/EnumDefinition/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/EnumDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/EnumDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/ErrorDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ErrorDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/EventDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/EventDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/ForStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ForStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionCall/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionCall/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionCall/original.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionCallArgsStatement/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionCallArgsStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionCallArgsStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionDefinition/all.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionDefinition/override-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionDefinition/params-first.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionType/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/FunctionType/original.sol (100%) rename {fmt => crates/fmt}/testdata/IfStatement/block-multi.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/IfStatement/block-single.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/IfStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/IfStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/IfStatement2/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/IfStatement2/original.sol (100%) rename {fmt => crates/fmt}/testdata/ImportDirective/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ImportDirective/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ImportDirective/original.sol (100%) rename {fmt => crates/fmt}/testdata/ImportDirective/preserve-quote.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ImportDirective/single-quote.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/InlineDisable/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/InlineDisable/original.sol (100%) rename {fmt => crates/fmt}/testdata/IntTypes/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/IntTypes/original.sol (100%) rename {fmt => crates/fmt}/testdata/IntTypes/preserve.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/IntTypes/short.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/LiteralExpression/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/LiteralExpression/original.sol (100%) rename {fmt => crates/fmt}/testdata/LiteralExpression/preserve-quote.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/LiteralExpression/single-quote.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/MappingType/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/MappingType/original.sol (100%) rename {fmt => crates/fmt}/testdata/ModifierDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ModifierDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/ModifierDefinition/override-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/NamedFunctionCallExpression/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/NamedFunctionCallExpression/original.sol (100%) rename {fmt => crates/fmt}/testdata/NumberLiteralUnderscore/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/NumberLiteralUnderscore/original.sol (100%) rename {fmt => crates/fmt}/testdata/NumberLiteralUnderscore/remove.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/NumberLiteralUnderscore/thousands.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/OperatorExpressions/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/OperatorExpressions/original.sol (100%) rename {fmt => crates/fmt}/testdata/PragmaDirective/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/PragmaDirective/original.sol (100%) rename {fmt => crates/fmt}/testdata/Repros/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/Repros/original.sol (100%) rename {fmt => crates/fmt}/testdata/ReturnStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ReturnStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/RevertNamedArgsStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/RevertNamedArgsStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/RevertStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/RevertStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/SimpleComments/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/SimpleComments/original.sol (100%) rename {fmt => crates/fmt}/testdata/SimpleComments/wrap-comments.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/StatementBlock/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/StatementBlock/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/StatementBlock/original.sol (100%) rename {fmt => crates/fmt}/testdata/StructDefinition/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/StructDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/StructDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/ThisExpression/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/ThisExpression/original.sol (100%) rename {fmt => crates/fmt}/testdata/TrailingComma/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/TrailingComma/original.sol (100%) rename {fmt => crates/fmt}/testdata/TryStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/TryStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/TypeDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/TypeDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/UnitExpression/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/UnitExpression/original.sol (100%) rename {fmt => crates/fmt}/testdata/UsingDirective/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/UsingDirective/original.sol (100%) rename {fmt => crates/fmt}/testdata/VariableAssignment/bracket-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/VariableAssignment/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/VariableAssignment/original.sol (100%) rename {fmt => crates/fmt}/testdata/VariableDefinition/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/VariableDefinition/original.sol (100%) rename {fmt => crates/fmt}/testdata/VariableDefinition/override-spacing.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/WhileStatement/block-multi.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/WhileStatement/block-single.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/WhileStatement/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/WhileStatement/original.sol (100%) rename {fmt => crates/fmt}/testdata/Yul/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/Yul/original.sol (100%) rename {fmt => crates/fmt}/testdata/YulStrings/fmt.sol (100%) rename {fmt => crates/fmt}/testdata/YulStrings/original.sol (100%) rename {fmt => crates/fmt}/testdata/YulStrings/preserve-quote.fmt.sol (100%) rename {fmt => crates/fmt}/testdata/YulStrings/single-quote.fmt.sol (100%) rename {fmt => crates/fmt}/tests/it/formatter.rs (100%) rename {fmt => crates/fmt}/tests/it/main.rs (100%) rename {forge => crates/forge}/Cargo.toml (100%) rename {forge => crates/forge}/README.md (100%) rename {forge => crates/forge}/src/coverage.rs (100%) rename {forge => crates/forge}/src/gas_report.rs (100%) rename {forge => crates/forge}/src/lib.rs (100%) rename {forge => crates/forge}/src/multi_runner.rs (100%) rename {forge => crates/forge}/src/result.rs (100%) rename {forge => crates/forge}/src/runner.rs (100%) rename {forge => crates/forge}/tests/it/cheats.rs (100%) rename {forge => crates/forge}/tests/it/config.rs (100%) rename {forge => crates/forge}/tests/it/core.rs (100%) rename {forge => crates/forge}/tests/it/fork.rs (100%) rename {forge => crates/forge}/tests/it/fs.rs (100%) rename {forge => crates/forge}/tests/it/fuzz.rs (100%) create mode 100644 crates/forge/tests/it/inline.rs rename {forge => crates/forge}/tests/it/invariant.rs (100%) rename {forge => crates/forge}/tests/it/main.rs (100%) rename {forge => crates/forge}/tests/it/repros.rs (100%) rename {forge => crates/forge}/tests/it/spec.rs (100%) rename {forge => crates/forge}/tests/it/test_helpers.rs (99%) rename {macros => crates/macros}/Cargo.toml (100%) rename {macros => crates/macros}/impl/Cargo.toml (100%) rename {macros => crates/macros}/impl/src/console_fmt.rs (100%) rename {macros => crates/macros}/impl/src/lib.rs (100%) rename {macros => crates/macros}/impl/src/utils.rs (100%) rename {macros => crates/macros}/src/fmt/console_fmt.rs (100%) rename {macros => crates/macros}/src/fmt/mod.rs (100%) rename {macros => crates/macros}/src/fmt/token.rs (100%) rename {macros => crates/macros}/src/fmt/ui.rs (100%) rename {macros => crates/macros}/src/lib.rs (100%) rename {ui => crates/ui}/Cargo.toml (100%) rename {ui => crates/ui}/src/lib.rs (100%) rename {ui => crates/ui}/src/op_effects.rs (100%) rename {utils => crates/utils}/Cargo.toml (100%) rename {utils => crates/utils}/README.md (100%) rename {utils => crates/utils}/src/abi.rs (92%) rename {utils => crates/utils}/src/error.rs (100%) rename {utils => crates/utils}/src/glob.rs (100%) rename {utils => crates/utils}/src/lib.rs (99%) rename {utils => crates/utils}/src/path.rs (100%) rename {utils => crates/utils}/src/rpc.rs (100%) delete mode 100644 forge/tests/it/inline.rs diff --git a/.gitattributes b/.gitattributes index cd0c8be2dfdb6..deea890e0c2da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ # auto-detection may fail for human-readable files, like the ones in abi/abi/*.sol **/*.sol linguist-language=Solidity -abi/src/bindings/*.rs linguist-generated +crates/abi/src/bindings/*.rs linguist-generated diff --git a/Cargo.toml b/Cargo.toml index 2e1f71ccddc02..a40dece90f1c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,25 +1,25 @@ [workspace] members = [ - "anvil", - "anvil/core", - "anvil/rpc", - "anvil/server", - "abi", - "binder", - "cast", - "chisel", - "cli", - "cli/test-utils", - "common", - "config", - "doc", - "evm", - "fmt", - "forge", - "macros", - "macros/impl", - "ui", - "utils", + "crates/anvil", + "crates/anvil/core", + "crates/anvil/rpc", + "crates/anvil/server", + "crates/abi", + "crates/binder", + "crates/cast", + "crates/chisel", + "crates/cli", + "crates/cli/test-utils", + "crates/common", + "crates/config", + "crates/doc", + "crates/evm", + "crates/fmt", + "crates/forge", + "crates/macros", + "crates/macros/impl", + "crates/ui", + "crates/utils", ] resolver = "2" diff --git a/abi/Cargo.toml b/crates/abi/Cargo.toml similarity index 100% rename from abi/Cargo.toml rename to crates/abi/Cargo.toml diff --git a/abi/README.md b/crates/abi/README.md similarity index 100% rename from abi/README.md rename to crates/abi/README.md diff --git a/abi/abi/Console.sol b/crates/abi/abi/Console.sol similarity index 100% rename from abi/abi/Console.sol rename to crates/abi/abi/Console.sol diff --git a/abi/abi/HEVM.sol b/crates/abi/abi/HEVM.sol similarity index 100% rename from abi/abi/HEVM.sol rename to crates/abi/abi/HEVM.sol diff --git a/abi/abi/HardhatConsole.json b/crates/abi/abi/HardhatConsole.json similarity index 100% rename from abi/abi/HardhatConsole.json rename to crates/abi/abi/HardhatConsole.json diff --git a/abi/build.rs b/crates/abi/build.rs similarity index 100% rename from abi/build.rs rename to crates/abi/build.rs diff --git a/abi/src/bindings/console.rs b/crates/abi/src/bindings/console.rs similarity index 100% rename from abi/src/bindings/console.rs rename to crates/abi/src/bindings/console.rs diff --git a/abi/src/bindings/hardhat_console.rs b/crates/abi/src/bindings/hardhat_console.rs similarity index 100% rename from abi/src/bindings/hardhat_console.rs rename to crates/abi/src/bindings/hardhat_console.rs diff --git a/abi/src/bindings/hevm.rs b/crates/abi/src/bindings/hevm.rs similarity index 100% rename from abi/src/bindings/hevm.rs rename to crates/abi/src/bindings/hevm.rs diff --git a/abi/src/bindings/mod.rs b/crates/abi/src/bindings/mod.rs similarity index 100% rename from abi/src/bindings/mod.rs rename to crates/abi/src/bindings/mod.rs diff --git a/abi/src/lib.rs b/crates/abi/src/lib.rs similarity index 100% rename from abi/src/lib.rs rename to crates/abi/src/lib.rs diff --git a/anvil/Cargo.toml b/crates/anvil/Cargo.toml similarity index 100% rename from anvil/Cargo.toml rename to crates/anvil/Cargo.toml diff --git a/anvil/README.md b/crates/anvil/README.md similarity index 100% rename from anvil/README.md rename to crates/anvil/README.md diff --git a/anvil/build.rs b/crates/anvil/build.rs similarity index 100% rename from anvil/build.rs rename to crates/anvil/build.rs diff --git a/anvil/core/Cargo.toml b/crates/anvil/core/Cargo.toml similarity index 100% rename from anvil/core/Cargo.toml rename to crates/anvil/core/Cargo.toml diff --git a/anvil/core/src/eth/block.rs b/crates/anvil/core/src/eth/block.rs similarity index 100% rename from anvil/core/src/eth/block.rs rename to crates/anvil/core/src/eth/block.rs diff --git a/anvil/core/src/eth/mod.rs b/crates/anvil/core/src/eth/mod.rs similarity index 100% rename from anvil/core/src/eth/mod.rs rename to crates/anvil/core/src/eth/mod.rs diff --git a/anvil/core/src/eth/proof.rs b/crates/anvil/core/src/eth/proof.rs similarity index 100% rename from anvil/core/src/eth/proof.rs rename to crates/anvil/core/src/eth/proof.rs diff --git a/anvil/core/src/eth/receipt.rs b/crates/anvil/core/src/eth/receipt.rs similarity index 100% rename from anvil/core/src/eth/receipt.rs rename to crates/anvil/core/src/eth/receipt.rs diff --git a/anvil/core/src/eth/serde_helpers.rs b/crates/anvil/core/src/eth/serde_helpers.rs similarity index 100% rename from anvil/core/src/eth/serde_helpers.rs rename to crates/anvil/core/src/eth/serde_helpers.rs diff --git a/anvil/core/src/eth/state.rs b/crates/anvil/core/src/eth/state.rs similarity index 100% rename from anvil/core/src/eth/state.rs rename to crates/anvil/core/src/eth/state.rs diff --git a/anvil/core/src/eth/subscription.rs b/crates/anvil/core/src/eth/subscription.rs similarity index 100% rename from anvil/core/src/eth/subscription.rs rename to crates/anvil/core/src/eth/subscription.rs diff --git a/anvil/core/src/eth/transaction/ethers_compat.rs b/crates/anvil/core/src/eth/transaction/ethers_compat.rs similarity index 100% rename from anvil/core/src/eth/transaction/ethers_compat.rs rename to crates/anvil/core/src/eth/transaction/ethers_compat.rs diff --git a/anvil/core/src/eth/transaction/mod.rs b/crates/anvil/core/src/eth/transaction/mod.rs similarity index 100% rename from anvil/core/src/eth/transaction/mod.rs rename to crates/anvil/core/src/eth/transaction/mod.rs diff --git a/anvil/core/src/eth/trie.rs b/crates/anvil/core/src/eth/trie.rs similarity index 100% rename from anvil/core/src/eth/trie.rs rename to crates/anvil/core/src/eth/trie.rs diff --git a/anvil/core/src/eth/utils.rs b/crates/anvil/core/src/eth/utils.rs similarity index 100% rename from anvil/core/src/eth/utils.rs rename to crates/anvil/core/src/eth/utils.rs diff --git a/anvil/core/src/lib.rs b/crates/anvil/core/src/lib.rs similarity index 100% rename from anvil/core/src/lib.rs rename to crates/anvil/core/src/lib.rs diff --git a/anvil/core/src/types.rs b/crates/anvil/core/src/types.rs similarity index 100% rename from anvil/core/src/types.rs rename to crates/anvil/core/src/types.rs diff --git a/anvil/rpc/Cargo.toml b/crates/anvil/rpc/Cargo.toml similarity index 100% rename from anvil/rpc/Cargo.toml rename to crates/anvil/rpc/Cargo.toml diff --git a/anvil/rpc/src/error.rs b/crates/anvil/rpc/src/error.rs similarity index 100% rename from anvil/rpc/src/error.rs rename to crates/anvil/rpc/src/error.rs diff --git a/anvil/rpc/src/lib.rs b/crates/anvil/rpc/src/lib.rs similarity index 100% rename from anvil/rpc/src/lib.rs rename to crates/anvil/rpc/src/lib.rs diff --git a/anvil/rpc/src/request.rs b/crates/anvil/rpc/src/request.rs similarity index 100% rename from anvil/rpc/src/request.rs rename to crates/anvil/rpc/src/request.rs diff --git a/anvil/rpc/src/response.rs b/crates/anvil/rpc/src/response.rs similarity index 100% rename from anvil/rpc/src/response.rs rename to crates/anvil/rpc/src/response.rs diff --git a/anvil/server/Cargo.toml b/crates/anvil/server/Cargo.toml similarity index 100% rename from anvil/server/Cargo.toml rename to crates/anvil/server/Cargo.toml diff --git a/anvil/server/src/config.rs b/crates/anvil/server/src/config.rs similarity index 100% rename from anvil/server/src/config.rs rename to crates/anvil/server/src/config.rs diff --git a/anvil/server/src/error.rs b/crates/anvil/server/src/error.rs similarity index 100% rename from anvil/server/src/error.rs rename to crates/anvil/server/src/error.rs diff --git a/anvil/server/src/handler.rs b/crates/anvil/server/src/handler.rs similarity index 100% rename from anvil/server/src/handler.rs rename to crates/anvil/server/src/handler.rs diff --git a/anvil/server/src/ipc.rs b/crates/anvil/server/src/ipc.rs similarity index 100% rename from anvil/server/src/ipc.rs rename to crates/anvil/server/src/ipc.rs diff --git a/anvil/server/src/lib.rs b/crates/anvil/server/src/lib.rs similarity index 100% rename from anvil/server/src/lib.rs rename to crates/anvil/server/src/lib.rs diff --git a/anvil/server/src/pubsub.rs b/crates/anvil/server/src/pubsub.rs similarity index 100% rename from anvil/server/src/pubsub.rs rename to crates/anvil/server/src/pubsub.rs diff --git a/anvil/server/src/ws.rs b/crates/anvil/server/src/ws.rs similarity index 100% rename from anvil/server/src/ws.rs rename to crates/anvil/server/src/ws.rs diff --git a/anvil/src/anvil.rs b/crates/anvil/src/anvil.rs similarity index 100% rename from anvil/src/anvil.rs rename to crates/anvil/src/anvil.rs diff --git a/anvil/src/cmd.rs b/crates/anvil/src/cmd.rs similarity index 100% rename from anvil/src/cmd.rs rename to crates/anvil/src/cmd.rs diff --git a/anvil/src/config.rs b/crates/anvil/src/config.rs similarity index 100% rename from anvil/src/config.rs rename to crates/anvil/src/config.rs diff --git a/anvil/src/eth/api.rs b/crates/anvil/src/eth/api.rs similarity index 100% rename from anvil/src/eth/api.rs rename to crates/anvil/src/eth/api.rs diff --git a/anvil/src/eth/backend/cheats.rs b/crates/anvil/src/eth/backend/cheats.rs similarity index 100% rename from anvil/src/eth/backend/cheats.rs rename to crates/anvil/src/eth/backend/cheats.rs diff --git a/anvil/src/eth/backend/db.rs b/crates/anvil/src/eth/backend/db.rs similarity index 100% rename from anvil/src/eth/backend/db.rs rename to crates/anvil/src/eth/backend/db.rs diff --git a/anvil/src/eth/backend/executor.rs b/crates/anvil/src/eth/backend/executor.rs similarity index 100% rename from anvil/src/eth/backend/executor.rs rename to crates/anvil/src/eth/backend/executor.rs diff --git a/anvil/src/eth/backend/fork.rs b/crates/anvil/src/eth/backend/fork.rs similarity index 100% rename from anvil/src/eth/backend/fork.rs rename to crates/anvil/src/eth/backend/fork.rs diff --git a/anvil/src/eth/backend/genesis.rs b/crates/anvil/src/eth/backend/genesis.rs similarity index 100% rename from anvil/src/eth/backend/genesis.rs rename to crates/anvil/src/eth/backend/genesis.rs diff --git a/anvil/src/eth/backend/info.rs b/crates/anvil/src/eth/backend/info.rs similarity index 100% rename from anvil/src/eth/backend/info.rs rename to crates/anvil/src/eth/backend/info.rs diff --git a/anvil/src/eth/backend/mem/cache.rs b/crates/anvil/src/eth/backend/mem/cache.rs similarity index 100% rename from anvil/src/eth/backend/mem/cache.rs rename to crates/anvil/src/eth/backend/mem/cache.rs diff --git a/anvil/src/eth/backend/mem/fork_db.rs b/crates/anvil/src/eth/backend/mem/fork_db.rs similarity index 100% rename from anvil/src/eth/backend/mem/fork_db.rs rename to crates/anvil/src/eth/backend/mem/fork_db.rs diff --git a/anvil/src/eth/backend/mem/in_memory_db.rs b/crates/anvil/src/eth/backend/mem/in_memory_db.rs similarity index 100% rename from anvil/src/eth/backend/mem/in_memory_db.rs rename to crates/anvil/src/eth/backend/mem/in_memory_db.rs diff --git a/anvil/src/eth/backend/mem/inspector.rs b/crates/anvil/src/eth/backend/mem/inspector.rs similarity index 100% rename from anvil/src/eth/backend/mem/inspector.rs rename to crates/anvil/src/eth/backend/mem/inspector.rs diff --git a/anvil/src/eth/backend/mem/mod.rs b/crates/anvil/src/eth/backend/mem/mod.rs similarity index 100% rename from anvil/src/eth/backend/mem/mod.rs rename to crates/anvil/src/eth/backend/mem/mod.rs diff --git a/anvil/src/eth/backend/mem/state.rs b/crates/anvil/src/eth/backend/mem/state.rs similarity index 100% rename from anvil/src/eth/backend/mem/state.rs rename to crates/anvil/src/eth/backend/mem/state.rs diff --git a/anvil/src/eth/backend/mem/storage.rs b/crates/anvil/src/eth/backend/mem/storage.rs similarity index 100% rename from anvil/src/eth/backend/mem/storage.rs rename to crates/anvil/src/eth/backend/mem/storage.rs diff --git a/anvil/src/eth/backend/mod.rs b/crates/anvil/src/eth/backend/mod.rs similarity index 100% rename from anvil/src/eth/backend/mod.rs rename to crates/anvil/src/eth/backend/mod.rs diff --git a/anvil/src/eth/backend/notifications.rs b/crates/anvil/src/eth/backend/notifications.rs similarity index 100% rename from anvil/src/eth/backend/notifications.rs rename to crates/anvil/src/eth/backend/notifications.rs diff --git a/anvil/src/eth/backend/time.rs b/crates/anvil/src/eth/backend/time.rs similarity index 100% rename from anvil/src/eth/backend/time.rs rename to crates/anvil/src/eth/backend/time.rs diff --git a/anvil/src/eth/backend/validate.rs b/crates/anvil/src/eth/backend/validate.rs similarity index 100% rename from anvil/src/eth/backend/validate.rs rename to crates/anvil/src/eth/backend/validate.rs diff --git a/anvil/src/eth/error.rs b/crates/anvil/src/eth/error.rs similarity index 100% rename from anvil/src/eth/error.rs rename to crates/anvil/src/eth/error.rs diff --git a/anvil/src/eth/fees.rs b/crates/anvil/src/eth/fees.rs similarity index 100% rename from anvil/src/eth/fees.rs rename to crates/anvil/src/eth/fees.rs diff --git a/anvil/src/eth/macros.rs b/crates/anvil/src/eth/macros.rs similarity index 100% rename from anvil/src/eth/macros.rs rename to crates/anvil/src/eth/macros.rs diff --git a/anvil/src/eth/miner.rs b/crates/anvil/src/eth/miner.rs similarity index 100% rename from anvil/src/eth/miner.rs rename to crates/anvil/src/eth/miner.rs diff --git a/anvil/src/eth/mod.rs b/crates/anvil/src/eth/mod.rs similarity index 100% rename from anvil/src/eth/mod.rs rename to crates/anvil/src/eth/mod.rs diff --git a/anvil/src/eth/otterscan/api.rs b/crates/anvil/src/eth/otterscan/api.rs similarity index 100% rename from anvil/src/eth/otterscan/api.rs rename to crates/anvil/src/eth/otterscan/api.rs diff --git a/anvil/src/eth/otterscan/mod.rs b/crates/anvil/src/eth/otterscan/mod.rs similarity index 100% rename from anvil/src/eth/otterscan/mod.rs rename to crates/anvil/src/eth/otterscan/mod.rs diff --git a/anvil/src/eth/otterscan/types.rs b/crates/anvil/src/eth/otterscan/types.rs similarity index 100% rename from anvil/src/eth/otterscan/types.rs rename to crates/anvil/src/eth/otterscan/types.rs diff --git a/anvil/src/eth/pool/mod.rs b/crates/anvil/src/eth/pool/mod.rs similarity index 100% rename from anvil/src/eth/pool/mod.rs rename to crates/anvil/src/eth/pool/mod.rs diff --git a/anvil/src/eth/pool/transactions.rs b/crates/anvil/src/eth/pool/transactions.rs similarity index 100% rename from anvil/src/eth/pool/transactions.rs rename to crates/anvil/src/eth/pool/transactions.rs diff --git a/anvil/src/eth/sign.rs b/crates/anvil/src/eth/sign.rs similarity index 100% rename from anvil/src/eth/sign.rs rename to crates/anvil/src/eth/sign.rs diff --git a/anvil/src/eth/util.rs b/crates/anvil/src/eth/util.rs similarity index 100% rename from anvil/src/eth/util.rs rename to crates/anvil/src/eth/util.rs diff --git a/anvil/src/filter.rs b/crates/anvil/src/filter.rs similarity index 100% rename from anvil/src/filter.rs rename to crates/anvil/src/filter.rs diff --git a/anvil/src/genesis.rs b/crates/anvil/src/genesis.rs similarity index 100% rename from anvil/src/genesis.rs rename to crates/anvil/src/genesis.rs diff --git a/anvil/src/hardfork.rs b/crates/anvil/src/hardfork.rs similarity index 100% rename from anvil/src/hardfork.rs rename to crates/anvil/src/hardfork.rs diff --git a/anvil/src/lib.rs b/crates/anvil/src/lib.rs similarity index 100% rename from anvil/src/lib.rs rename to crates/anvil/src/lib.rs diff --git a/anvil/src/logging.rs b/crates/anvil/src/logging.rs similarity index 100% rename from anvil/src/logging.rs rename to crates/anvil/src/logging.rs diff --git a/anvil/src/pubsub.rs b/crates/anvil/src/pubsub.rs similarity index 100% rename from anvil/src/pubsub.rs rename to crates/anvil/src/pubsub.rs diff --git a/anvil/src/server/error.rs b/crates/anvil/src/server/error.rs similarity index 100% rename from anvil/src/server/error.rs rename to crates/anvil/src/server/error.rs diff --git a/anvil/src/server/handler.rs b/crates/anvil/src/server/handler.rs similarity index 100% rename from anvil/src/server/handler.rs rename to crates/anvil/src/server/handler.rs diff --git a/anvil/src/server/mod.rs b/crates/anvil/src/server/mod.rs similarity index 100% rename from anvil/src/server/mod.rs rename to crates/anvil/src/server/mod.rs diff --git a/anvil/src/service.rs b/crates/anvil/src/service.rs similarity index 100% rename from anvil/src/service.rs rename to crates/anvil/src/service.rs diff --git a/anvil/src/shutdown.rs b/crates/anvil/src/shutdown.rs similarity index 100% rename from anvil/src/shutdown.rs rename to crates/anvil/src/shutdown.rs diff --git a/anvil/src/tasks/block_listener.rs b/crates/anvil/src/tasks/block_listener.rs similarity index 100% rename from anvil/src/tasks/block_listener.rs rename to crates/anvil/src/tasks/block_listener.rs diff --git a/anvil/src/tasks/mod.rs b/crates/anvil/src/tasks/mod.rs similarity index 100% rename from anvil/src/tasks/mod.rs rename to crates/anvil/src/tasks/mod.rs diff --git a/anvil/test-data/SimpleStorage.json b/crates/anvil/test-data/SimpleStorage.json similarity index 100% rename from anvil/test-data/SimpleStorage.json rename to crates/anvil/test-data/SimpleStorage.json diff --git a/anvil/test-data/SimpleStorage.sol b/crates/anvil/test-data/SimpleStorage.sol similarity index 100% rename from anvil/test-data/SimpleStorage.sol rename to crates/anvil/test-data/SimpleStorage.sol diff --git a/anvil/test-data/emit_logs.json b/crates/anvil/test-data/emit_logs.json similarity index 100% rename from anvil/test-data/emit_logs.json rename to crates/anvil/test-data/emit_logs.json diff --git a/anvil/test-data/emit_logs.sol b/crates/anvil/test-data/emit_logs.sol similarity index 100% rename from anvil/test-data/emit_logs.sol rename to crates/anvil/test-data/emit_logs.sol diff --git a/anvil/test-data/greeter.json b/crates/anvil/test-data/greeter.json similarity index 100% rename from anvil/test-data/greeter.json rename to crates/anvil/test-data/greeter.json diff --git a/anvil/test-data/multicall.json b/crates/anvil/test-data/multicall.json similarity index 100% rename from anvil/test-data/multicall.json rename to crates/anvil/test-data/multicall.json diff --git a/anvil/test-data/multicall.sol b/crates/anvil/test-data/multicall.sol similarity index 100% rename from anvil/test-data/multicall.sol rename to crates/anvil/test-data/multicall.sol diff --git a/anvil/tests/it/abi.rs b/crates/anvil/tests/it/abi.rs similarity index 100% rename from anvil/tests/it/abi.rs rename to crates/anvil/tests/it/abi.rs diff --git a/anvil/tests/it/anvil.rs b/crates/anvil/tests/it/anvil.rs similarity index 100% rename from anvil/tests/it/anvil.rs rename to crates/anvil/tests/it/anvil.rs diff --git a/anvil/tests/it/anvil_api.rs b/crates/anvil/tests/it/anvil_api.rs similarity index 100% rename from anvil/tests/it/anvil_api.rs rename to crates/anvil/tests/it/anvil_api.rs diff --git a/anvil/tests/it/api.rs b/crates/anvil/tests/it/api.rs similarity index 100% rename from anvil/tests/it/api.rs rename to crates/anvil/tests/it/api.rs diff --git a/anvil/tests/it/fork.rs b/crates/anvil/tests/it/fork.rs similarity index 100% rename from anvil/tests/it/fork.rs rename to crates/anvil/tests/it/fork.rs diff --git a/anvil/tests/it/ganache.rs b/crates/anvil/tests/it/ganache.rs similarity index 100% rename from anvil/tests/it/ganache.rs rename to crates/anvil/tests/it/ganache.rs diff --git a/anvil/tests/it/gas.rs b/crates/anvil/tests/it/gas.rs similarity index 100% rename from anvil/tests/it/gas.rs rename to crates/anvil/tests/it/gas.rs diff --git a/anvil/tests/it/genesis.rs b/crates/anvil/tests/it/genesis.rs similarity index 100% rename from anvil/tests/it/genesis.rs rename to crates/anvil/tests/it/genesis.rs diff --git a/anvil/tests/it/geth.rs b/crates/anvil/tests/it/geth.rs similarity index 100% rename from anvil/tests/it/geth.rs rename to crates/anvil/tests/it/geth.rs diff --git a/anvil/tests/it/ipc.rs b/crates/anvil/tests/it/ipc.rs similarity index 100% rename from anvil/tests/it/ipc.rs rename to crates/anvil/tests/it/ipc.rs diff --git a/anvil/tests/it/logs.rs b/crates/anvil/tests/it/logs.rs similarity index 100% rename from anvil/tests/it/logs.rs rename to crates/anvil/tests/it/logs.rs diff --git a/anvil/tests/it/main.rs b/crates/anvil/tests/it/main.rs similarity index 100% rename from anvil/tests/it/main.rs rename to crates/anvil/tests/it/main.rs diff --git a/anvil/tests/it/otterscan.rs b/crates/anvil/tests/it/otterscan.rs similarity index 100% rename from anvil/tests/it/otterscan.rs rename to crates/anvil/tests/it/otterscan.rs diff --git a/anvil/tests/it/proof/eip1186.rs b/crates/anvil/tests/it/proof/eip1186.rs similarity index 100% rename from anvil/tests/it/proof/eip1186.rs rename to crates/anvil/tests/it/proof/eip1186.rs diff --git a/anvil/tests/it/proof/mod.rs b/crates/anvil/tests/it/proof/mod.rs similarity index 100% rename from anvil/tests/it/proof/mod.rs rename to crates/anvil/tests/it/proof/mod.rs diff --git a/anvil/tests/it/pubsub.rs b/crates/anvil/tests/it/pubsub.rs similarity index 100% rename from anvil/tests/it/pubsub.rs rename to crates/anvil/tests/it/pubsub.rs diff --git a/anvil/tests/it/revert.rs b/crates/anvil/tests/it/revert.rs similarity index 100% rename from anvil/tests/it/revert.rs rename to crates/anvil/tests/it/revert.rs diff --git a/anvil/tests/it/sign.rs b/crates/anvil/tests/it/sign.rs similarity index 100% rename from anvil/tests/it/sign.rs rename to crates/anvil/tests/it/sign.rs diff --git a/anvil/tests/it/traces.rs b/crates/anvil/tests/it/traces.rs similarity index 100% rename from anvil/tests/it/traces.rs rename to crates/anvil/tests/it/traces.rs diff --git a/anvil/tests/it/transaction.rs b/crates/anvil/tests/it/transaction.rs similarity index 100% rename from anvil/tests/it/transaction.rs rename to crates/anvil/tests/it/transaction.rs diff --git a/anvil/tests/it/txpool.rs b/crates/anvil/tests/it/txpool.rs similarity index 100% rename from anvil/tests/it/txpool.rs rename to crates/anvil/tests/it/txpool.rs diff --git a/anvil/tests/it/utils.rs b/crates/anvil/tests/it/utils.rs similarity index 100% rename from anvil/tests/it/utils.rs rename to crates/anvil/tests/it/utils.rs diff --git a/anvil/tests/it/wsapi.rs b/crates/anvil/tests/it/wsapi.rs similarity index 100% rename from anvil/tests/it/wsapi.rs rename to crates/anvil/tests/it/wsapi.rs diff --git a/binder/Cargo.toml b/crates/binder/Cargo.toml similarity index 100% rename from binder/Cargo.toml rename to crates/binder/Cargo.toml diff --git a/binder/README.md b/crates/binder/README.md similarity index 100% rename from binder/README.md rename to crates/binder/README.md diff --git a/binder/src/lib.rs b/crates/binder/src/lib.rs similarity index 100% rename from binder/src/lib.rs rename to crates/binder/src/lib.rs diff --git a/binder/src/utils.rs b/crates/binder/src/utils.rs similarity index 100% rename from binder/src/utils.rs rename to crates/binder/src/utils.rs diff --git a/cast/Cargo.toml b/crates/cast/Cargo.toml similarity index 100% rename from cast/Cargo.toml rename to crates/cast/Cargo.toml diff --git a/cast/README.md b/crates/cast/README.md similarity index 100% rename from cast/README.md rename to crates/cast/README.md diff --git a/cast/src/base.rs b/crates/cast/src/base.rs similarity index 100% rename from cast/src/base.rs rename to crates/cast/src/base.rs diff --git a/cast/src/errors.rs b/crates/cast/src/errors.rs similarity index 100% rename from cast/src/errors.rs rename to crates/cast/src/errors.rs diff --git a/cast/src/lib.rs b/crates/cast/src/lib.rs similarity index 100% rename from cast/src/lib.rs rename to crates/cast/src/lib.rs diff --git a/cast/src/rlp_converter.rs b/crates/cast/src/rlp_converter.rs similarity index 100% rename from cast/src/rlp_converter.rs rename to crates/cast/src/rlp_converter.rs diff --git a/cast/src/tx.rs b/crates/cast/src/tx.rs similarity index 100% rename from cast/src/tx.rs rename to crates/cast/src/tx.rs diff --git a/chisel/Cargo.toml b/crates/chisel/Cargo.toml similarity index 100% rename from chisel/Cargo.toml rename to crates/chisel/Cargo.toml diff --git a/chisel/README.md b/crates/chisel/README.md similarity index 100% rename from chisel/README.md rename to crates/chisel/README.md diff --git a/chisel/assets/preview.gif b/crates/chisel/assets/preview.gif similarity index 100% rename from chisel/assets/preview.gif rename to crates/chisel/assets/preview.gif diff --git a/chisel/assets/preview.tape b/crates/chisel/assets/preview.tape similarity index 100% rename from chisel/assets/preview.tape rename to crates/chisel/assets/preview.tape diff --git a/chisel/benches/session_source.rs b/crates/chisel/benches/session_source.rs similarity index 100% rename from chisel/benches/session_source.rs rename to crates/chisel/benches/session_source.rs diff --git a/chisel/build.rs b/crates/chisel/build.rs similarity index 100% rename from chisel/build.rs rename to crates/chisel/build.rs diff --git a/chisel/src/bin/chisel.rs b/crates/chisel/src/bin/chisel.rs similarity index 100% rename from chisel/src/bin/chisel.rs rename to crates/chisel/src/bin/chisel.rs diff --git a/chisel/src/cmd.rs b/crates/chisel/src/cmd.rs similarity index 100% rename from chisel/src/cmd.rs rename to crates/chisel/src/cmd.rs diff --git a/chisel/src/dispatcher.rs b/crates/chisel/src/dispatcher.rs similarity index 100% rename from chisel/src/dispatcher.rs rename to crates/chisel/src/dispatcher.rs diff --git a/chisel/src/executor.rs b/crates/chisel/src/executor.rs similarity index 100% rename from chisel/src/executor.rs rename to crates/chisel/src/executor.rs diff --git a/chisel/src/history.rs b/crates/chisel/src/history.rs similarity index 100% rename from chisel/src/history.rs rename to crates/chisel/src/history.rs diff --git a/chisel/src/lib.rs b/crates/chisel/src/lib.rs similarity index 100% rename from chisel/src/lib.rs rename to crates/chisel/src/lib.rs diff --git a/chisel/src/runner.rs b/crates/chisel/src/runner.rs similarity index 100% rename from chisel/src/runner.rs rename to crates/chisel/src/runner.rs diff --git a/chisel/src/session.rs b/crates/chisel/src/session.rs similarity index 100% rename from chisel/src/session.rs rename to crates/chisel/src/session.rs diff --git a/chisel/src/session_source.rs b/crates/chisel/src/session_source.rs similarity index 99% rename from chisel/src/session_source.rs rename to crates/chisel/src/session_source.rs index 0242014071354..852afff3a62f7 100644 --- a/chisel/src/session_source.rs +++ b/crates/chisel/src/session_source.rs @@ -19,7 +19,7 @@ use std::{collections::HashMap, fs, path::PathBuf}; use yansi::Paint; /// Solidity source for the `Vm` interface in [forge-std](https://github.com/foundry-rs/forge-std) -static VM_SOURCE: &str = include_str!("../../testdata/cheats/Vm.sol"); +static VM_SOURCE: &str = include_str!("../../../testdata/cheats/Vm.sol"); /// Intermediate output for the compiled [SessionSource] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] diff --git a/chisel/src/solidity_helper.rs b/crates/chisel/src/solidity_helper.rs similarity index 100% rename from chisel/src/solidity_helper.rs rename to crates/chisel/src/solidity_helper.rs diff --git a/chisel/tests/cache.rs b/crates/chisel/tests/cache.rs similarity index 100% rename from chisel/tests/cache.rs rename to crates/chisel/tests/cache.rs diff --git a/cli/Cargo.toml b/crates/cli/Cargo.toml similarity index 100% rename from cli/Cargo.toml rename to crates/cli/Cargo.toml diff --git a/cli/README.md b/crates/cli/README.md similarity index 100% rename from cli/README.md rename to crates/cli/README.md diff --git a/cli/assets/.gitignoreTemplate b/crates/cli/assets/.gitignoreTemplate similarity index 100% rename from cli/assets/.gitignoreTemplate rename to crates/cli/assets/.gitignoreTemplate diff --git a/cli/assets/CounterTemplate.s.sol b/crates/cli/assets/CounterTemplate.s.sol similarity index 100% rename from cli/assets/CounterTemplate.s.sol rename to crates/cli/assets/CounterTemplate.s.sol diff --git a/cli/assets/CounterTemplate.sol b/crates/cli/assets/CounterTemplate.sol similarity index 100% rename from cli/assets/CounterTemplate.sol rename to crates/cli/assets/CounterTemplate.sol diff --git a/cli/assets/CounterTemplate.t.sol b/crates/cli/assets/CounterTemplate.t.sol similarity index 100% rename from cli/assets/CounterTemplate.t.sol rename to crates/cli/assets/CounterTemplate.t.sol diff --git a/cli/assets/README.md b/crates/cli/assets/README.md similarity index 100% rename from cli/assets/README.md rename to crates/cli/assets/README.md diff --git a/cli/assets/generated/TestTemplate.t.sol b/crates/cli/assets/generated/TestTemplate.t.sol similarity index 100% rename from cli/assets/generated/TestTemplate.t.sol rename to crates/cli/assets/generated/TestTemplate.t.sol diff --git a/cli/assets/workflowTemplate.yml b/crates/cli/assets/workflowTemplate.yml similarity index 100% rename from cli/assets/workflowTemplate.yml rename to crates/cli/assets/workflowTemplate.yml diff --git a/cli/benches/cast.rs b/crates/cli/benches/cast.rs similarity index 100% rename from cli/benches/cast.rs rename to crates/cli/benches/cast.rs diff --git a/cli/benches/forge_test.rs b/crates/cli/benches/forge_test.rs similarity index 100% rename from cli/benches/forge_test.rs rename to crates/cli/benches/forge_test.rs diff --git a/cli/build.rs b/crates/cli/build.rs similarity index 100% rename from cli/build.rs rename to crates/cli/build.rs diff --git a/cli/src/cast/cmd/access_list.rs b/crates/cli/src/cast/cmd/access_list.rs similarity index 100% rename from cli/src/cast/cmd/access_list.rs rename to crates/cli/src/cast/cmd/access_list.rs diff --git a/cli/src/cast/cmd/bind.rs b/crates/cli/src/cast/cmd/bind.rs similarity index 100% rename from cli/src/cast/cmd/bind.rs rename to crates/cli/src/cast/cmd/bind.rs diff --git a/cli/src/cast/cmd/call.rs b/crates/cli/src/cast/cmd/call.rs similarity index 100% rename from cli/src/cast/cmd/call.rs rename to crates/cli/src/cast/cmd/call.rs diff --git a/cli/src/cast/cmd/create2.rs b/crates/cli/src/cast/cmd/create2.rs similarity index 100% rename from cli/src/cast/cmd/create2.rs rename to crates/cli/src/cast/cmd/create2.rs diff --git a/cli/src/cast/cmd/estimate.rs b/crates/cli/src/cast/cmd/estimate.rs similarity index 100% rename from cli/src/cast/cmd/estimate.rs rename to crates/cli/src/cast/cmd/estimate.rs diff --git a/cli/src/cast/cmd/find_block.rs b/crates/cli/src/cast/cmd/find_block.rs similarity index 100% rename from cli/src/cast/cmd/find_block.rs rename to crates/cli/src/cast/cmd/find_block.rs diff --git a/cli/src/cast/cmd/interface.rs b/crates/cli/src/cast/cmd/interface.rs similarity index 100% rename from cli/src/cast/cmd/interface.rs rename to crates/cli/src/cast/cmd/interface.rs diff --git a/cli/src/cast/cmd/logs.rs b/crates/cli/src/cast/cmd/logs.rs similarity index 100% rename from cli/src/cast/cmd/logs.rs rename to crates/cli/src/cast/cmd/logs.rs diff --git a/cli/src/cast/cmd/mod.rs b/crates/cli/src/cast/cmd/mod.rs similarity index 100% rename from cli/src/cast/cmd/mod.rs rename to crates/cli/src/cast/cmd/mod.rs diff --git a/cli/src/cast/cmd/rpc.rs b/crates/cli/src/cast/cmd/rpc.rs similarity index 100% rename from cli/src/cast/cmd/rpc.rs rename to crates/cli/src/cast/cmd/rpc.rs diff --git a/cli/src/cast/cmd/run.rs b/crates/cli/src/cast/cmd/run.rs similarity index 100% rename from cli/src/cast/cmd/run.rs rename to crates/cli/src/cast/cmd/run.rs diff --git a/cli/src/cast/cmd/send.rs b/crates/cli/src/cast/cmd/send.rs similarity index 100% rename from cli/src/cast/cmd/send.rs rename to crates/cli/src/cast/cmd/send.rs diff --git a/cli/src/cast/cmd/storage.rs b/crates/cli/src/cast/cmd/storage.rs similarity index 100% rename from cli/src/cast/cmd/storage.rs rename to crates/cli/src/cast/cmd/storage.rs diff --git a/cli/src/cast/cmd/wallet/mod.rs b/crates/cli/src/cast/cmd/wallet/mod.rs similarity index 100% rename from cli/src/cast/cmd/wallet/mod.rs rename to crates/cli/src/cast/cmd/wallet/mod.rs diff --git a/cli/src/cast/cmd/wallet/vanity.rs b/crates/cli/src/cast/cmd/wallet/vanity.rs similarity index 100% rename from cli/src/cast/cmd/wallet/vanity.rs rename to crates/cli/src/cast/cmd/wallet/vanity.rs diff --git a/cli/src/cast/main.rs b/crates/cli/src/cast/main.rs similarity index 100% rename from cli/src/cast/main.rs rename to crates/cli/src/cast/main.rs diff --git a/cli/src/cast/opts.rs b/crates/cli/src/cast/opts.rs similarity index 100% rename from cli/src/cast/opts.rs rename to crates/cli/src/cast/opts.rs diff --git a/cli/src/forge/cmd/bind.rs b/crates/cli/src/forge/cmd/bind.rs similarity index 100% rename from cli/src/forge/cmd/bind.rs rename to crates/cli/src/forge/cmd/bind.rs diff --git a/cli/src/forge/cmd/build.rs b/crates/cli/src/forge/cmd/build.rs similarity index 100% rename from cli/src/forge/cmd/build.rs rename to crates/cli/src/forge/cmd/build.rs diff --git a/cli/src/forge/cmd/cache.rs b/crates/cli/src/forge/cmd/cache.rs similarity index 100% rename from cli/src/forge/cmd/cache.rs rename to crates/cli/src/forge/cmd/cache.rs diff --git a/cli/src/forge/cmd/config.rs b/crates/cli/src/forge/cmd/config.rs similarity index 100% rename from cli/src/forge/cmd/config.rs rename to crates/cli/src/forge/cmd/config.rs diff --git a/cli/src/forge/cmd/coverage.rs b/crates/cli/src/forge/cmd/coverage.rs similarity index 100% rename from cli/src/forge/cmd/coverage.rs rename to crates/cli/src/forge/cmd/coverage.rs diff --git a/cli/src/forge/cmd/create.rs b/crates/cli/src/forge/cmd/create.rs similarity index 100% rename from cli/src/forge/cmd/create.rs rename to crates/cli/src/forge/cmd/create.rs diff --git a/cli/src/forge/cmd/debug.rs b/crates/cli/src/forge/cmd/debug.rs similarity index 100% rename from cli/src/forge/cmd/debug.rs rename to crates/cli/src/forge/cmd/debug.rs diff --git a/cli/src/forge/cmd/doc.rs b/crates/cli/src/forge/cmd/doc.rs similarity index 100% rename from cli/src/forge/cmd/doc.rs rename to crates/cli/src/forge/cmd/doc.rs diff --git a/cli/src/forge/cmd/flatten.rs b/crates/cli/src/forge/cmd/flatten.rs similarity index 100% rename from cli/src/forge/cmd/flatten.rs rename to crates/cli/src/forge/cmd/flatten.rs diff --git a/cli/src/forge/cmd/fmt.rs b/crates/cli/src/forge/cmd/fmt.rs similarity index 100% rename from cli/src/forge/cmd/fmt.rs rename to crates/cli/src/forge/cmd/fmt.rs diff --git a/cli/src/forge/cmd/fourbyte.rs b/crates/cli/src/forge/cmd/fourbyte.rs similarity index 100% rename from cli/src/forge/cmd/fourbyte.rs rename to crates/cli/src/forge/cmd/fourbyte.rs diff --git a/cli/src/forge/cmd/geiger/error.rs b/crates/cli/src/forge/cmd/geiger/error.rs similarity index 100% rename from cli/src/forge/cmd/geiger/error.rs rename to crates/cli/src/forge/cmd/geiger/error.rs diff --git a/cli/src/forge/cmd/geiger/find.rs b/crates/cli/src/forge/cmd/geiger/find.rs similarity index 100% rename from cli/src/forge/cmd/geiger/find.rs rename to crates/cli/src/forge/cmd/geiger/find.rs diff --git a/cli/src/forge/cmd/geiger/mod.rs b/crates/cli/src/forge/cmd/geiger/mod.rs similarity index 100% rename from cli/src/forge/cmd/geiger/mod.rs rename to crates/cli/src/forge/cmd/geiger/mod.rs diff --git a/cli/src/forge/cmd/geiger/visitor.rs b/crates/cli/src/forge/cmd/geiger/visitor.rs similarity index 100% rename from cli/src/forge/cmd/geiger/visitor.rs rename to crates/cli/src/forge/cmd/geiger/visitor.rs diff --git a/cli/src/forge/cmd/generate/mod.rs b/crates/cli/src/forge/cmd/generate/mod.rs similarity index 100% rename from cli/src/forge/cmd/generate/mod.rs rename to crates/cli/src/forge/cmd/generate/mod.rs diff --git a/cli/src/forge/cmd/init.rs b/crates/cli/src/forge/cmd/init.rs similarity index 100% rename from cli/src/forge/cmd/init.rs rename to crates/cli/src/forge/cmd/init.rs diff --git a/cli/src/forge/cmd/inspect.rs b/crates/cli/src/forge/cmd/inspect.rs similarity index 100% rename from cli/src/forge/cmd/inspect.rs rename to crates/cli/src/forge/cmd/inspect.rs diff --git a/cli/src/forge/cmd/install.rs b/crates/cli/src/forge/cmd/install.rs similarity index 100% rename from cli/src/forge/cmd/install.rs rename to crates/cli/src/forge/cmd/install.rs diff --git a/cli/src/forge/cmd/mod.rs b/crates/cli/src/forge/cmd/mod.rs similarity index 100% rename from cli/src/forge/cmd/mod.rs rename to crates/cli/src/forge/cmd/mod.rs diff --git a/cli/src/forge/cmd/remappings.rs b/crates/cli/src/forge/cmd/remappings.rs similarity index 100% rename from cli/src/forge/cmd/remappings.rs rename to crates/cli/src/forge/cmd/remappings.rs diff --git a/cli/src/forge/cmd/remove.rs b/crates/cli/src/forge/cmd/remove.rs similarity index 100% rename from cli/src/forge/cmd/remove.rs rename to crates/cli/src/forge/cmd/remove.rs diff --git a/cli/src/forge/cmd/retry.rs b/crates/cli/src/forge/cmd/retry.rs similarity index 100% rename from cli/src/forge/cmd/retry.rs rename to crates/cli/src/forge/cmd/retry.rs diff --git a/cli/src/forge/cmd/script/artifacts.rs b/crates/cli/src/forge/cmd/script/artifacts.rs similarity index 100% rename from cli/src/forge/cmd/script/artifacts.rs rename to crates/cli/src/forge/cmd/script/artifacts.rs diff --git a/cli/src/forge/cmd/script/broadcast.rs b/crates/cli/src/forge/cmd/script/broadcast.rs similarity index 100% rename from cli/src/forge/cmd/script/broadcast.rs rename to crates/cli/src/forge/cmd/script/broadcast.rs diff --git a/cli/src/forge/cmd/script/build.rs b/crates/cli/src/forge/cmd/script/build.rs similarity index 100% rename from cli/src/forge/cmd/script/build.rs rename to crates/cli/src/forge/cmd/script/build.rs diff --git a/cli/src/forge/cmd/script/cmd.rs b/crates/cli/src/forge/cmd/script/cmd.rs similarity index 100% rename from cli/src/forge/cmd/script/cmd.rs rename to crates/cli/src/forge/cmd/script/cmd.rs diff --git a/cli/src/forge/cmd/script/executor.rs b/crates/cli/src/forge/cmd/script/executor.rs similarity index 100% rename from cli/src/forge/cmd/script/executor.rs rename to crates/cli/src/forge/cmd/script/executor.rs diff --git a/cli/src/forge/cmd/script/mod.rs b/crates/cli/src/forge/cmd/script/mod.rs similarity index 100% rename from cli/src/forge/cmd/script/mod.rs rename to crates/cli/src/forge/cmd/script/mod.rs diff --git a/cli/src/forge/cmd/script/multi.rs b/crates/cli/src/forge/cmd/script/multi.rs similarity index 100% rename from cli/src/forge/cmd/script/multi.rs rename to crates/cli/src/forge/cmd/script/multi.rs diff --git a/cli/src/forge/cmd/script/providers.rs b/crates/cli/src/forge/cmd/script/providers.rs similarity index 100% rename from cli/src/forge/cmd/script/providers.rs rename to crates/cli/src/forge/cmd/script/providers.rs diff --git a/cli/src/forge/cmd/script/receipts.rs b/crates/cli/src/forge/cmd/script/receipts.rs similarity index 100% rename from cli/src/forge/cmd/script/receipts.rs rename to crates/cli/src/forge/cmd/script/receipts.rs diff --git a/cli/src/forge/cmd/script/runner.rs b/crates/cli/src/forge/cmd/script/runner.rs similarity index 100% rename from cli/src/forge/cmd/script/runner.rs rename to crates/cli/src/forge/cmd/script/runner.rs diff --git a/cli/src/forge/cmd/script/sequence.rs b/crates/cli/src/forge/cmd/script/sequence.rs similarity index 100% rename from cli/src/forge/cmd/script/sequence.rs rename to crates/cli/src/forge/cmd/script/sequence.rs diff --git a/cli/src/forge/cmd/script/transaction.rs b/crates/cli/src/forge/cmd/script/transaction.rs similarity index 100% rename from cli/src/forge/cmd/script/transaction.rs rename to crates/cli/src/forge/cmd/script/transaction.rs diff --git a/cli/src/forge/cmd/script/verify.rs b/crates/cli/src/forge/cmd/script/verify.rs similarity index 100% rename from cli/src/forge/cmd/script/verify.rs rename to crates/cli/src/forge/cmd/script/verify.rs diff --git a/cli/src/forge/cmd/selectors.rs b/crates/cli/src/forge/cmd/selectors.rs similarity index 100% rename from cli/src/forge/cmd/selectors.rs rename to crates/cli/src/forge/cmd/selectors.rs diff --git a/cli/src/forge/cmd/snapshot.rs b/crates/cli/src/forge/cmd/snapshot.rs similarity index 100% rename from cli/src/forge/cmd/snapshot.rs rename to crates/cli/src/forge/cmd/snapshot.rs diff --git a/cli/src/forge/cmd/test/filter.rs b/crates/cli/src/forge/cmd/test/filter.rs similarity index 100% rename from cli/src/forge/cmd/test/filter.rs rename to crates/cli/src/forge/cmd/test/filter.rs diff --git a/cli/src/forge/cmd/test/mod.rs b/crates/cli/src/forge/cmd/test/mod.rs similarity index 100% rename from cli/src/forge/cmd/test/mod.rs rename to crates/cli/src/forge/cmd/test/mod.rs diff --git a/cli/src/forge/cmd/tree.rs b/crates/cli/src/forge/cmd/tree.rs similarity index 100% rename from cli/src/forge/cmd/tree.rs rename to crates/cli/src/forge/cmd/tree.rs diff --git a/cli/src/forge/cmd/update.rs b/crates/cli/src/forge/cmd/update.rs similarity index 100% rename from cli/src/forge/cmd/update.rs rename to crates/cli/src/forge/cmd/update.rs diff --git a/cli/src/forge/cmd/verify/etherscan/flatten.rs b/crates/cli/src/forge/cmd/verify/etherscan/flatten.rs similarity index 100% rename from cli/src/forge/cmd/verify/etherscan/flatten.rs rename to crates/cli/src/forge/cmd/verify/etherscan/flatten.rs diff --git a/cli/src/forge/cmd/verify/etherscan/mod.rs b/crates/cli/src/forge/cmd/verify/etherscan/mod.rs similarity index 100% rename from cli/src/forge/cmd/verify/etherscan/mod.rs rename to crates/cli/src/forge/cmd/verify/etherscan/mod.rs diff --git a/cli/src/forge/cmd/verify/etherscan/standard_json.rs b/crates/cli/src/forge/cmd/verify/etherscan/standard_json.rs similarity index 100% rename from cli/src/forge/cmd/verify/etherscan/standard_json.rs rename to crates/cli/src/forge/cmd/verify/etherscan/standard_json.rs diff --git a/cli/src/forge/cmd/verify/mod.rs b/crates/cli/src/forge/cmd/verify/mod.rs similarity index 100% rename from cli/src/forge/cmd/verify/mod.rs rename to crates/cli/src/forge/cmd/verify/mod.rs diff --git a/cli/src/forge/cmd/verify/provider.rs b/crates/cli/src/forge/cmd/verify/provider.rs similarity index 100% rename from cli/src/forge/cmd/verify/provider.rs rename to crates/cli/src/forge/cmd/verify/provider.rs diff --git a/cli/src/forge/cmd/verify/sourcify.rs b/crates/cli/src/forge/cmd/verify/sourcify.rs similarity index 100% rename from cli/src/forge/cmd/verify/sourcify.rs rename to crates/cli/src/forge/cmd/verify/sourcify.rs diff --git a/cli/src/forge/cmd/watch.rs b/crates/cli/src/forge/cmd/watch.rs similarity index 100% rename from cli/src/forge/cmd/watch.rs rename to crates/cli/src/forge/cmd/watch.rs diff --git a/cli/src/forge/main.rs b/crates/cli/src/forge/main.rs similarity index 100% rename from cli/src/forge/main.rs rename to crates/cli/src/forge/main.rs diff --git a/cli/src/forge/opts.rs b/crates/cli/src/forge/opts.rs similarity index 100% rename from cli/src/forge/opts.rs rename to crates/cli/src/forge/opts.rs diff --git a/cli/src/handler.rs b/crates/cli/src/handler.rs similarity index 100% rename from cli/src/handler.rs rename to crates/cli/src/handler.rs diff --git a/cli/src/lib.rs b/crates/cli/src/lib.rs similarity index 100% rename from cli/src/lib.rs rename to crates/cli/src/lib.rs diff --git a/cli/src/opts/build/core.rs b/crates/cli/src/opts/build/core.rs similarity index 100% rename from cli/src/opts/build/core.rs rename to crates/cli/src/opts/build/core.rs diff --git a/cli/src/opts/build/mod.rs b/crates/cli/src/opts/build/mod.rs similarity index 100% rename from cli/src/opts/build/mod.rs rename to crates/cli/src/opts/build/mod.rs diff --git a/cli/src/opts/build/paths.rs b/crates/cli/src/opts/build/paths.rs similarity index 100% rename from cli/src/opts/build/paths.rs rename to crates/cli/src/opts/build/paths.rs diff --git a/cli/src/opts/chain.rs b/crates/cli/src/opts/chain.rs similarity index 100% rename from cli/src/opts/chain.rs rename to crates/cli/src/opts/chain.rs diff --git a/cli/src/opts/dependency.rs b/crates/cli/src/opts/dependency.rs similarity index 100% rename from cli/src/opts/dependency.rs rename to crates/cli/src/opts/dependency.rs diff --git a/cli/src/opts/ethereum.rs b/crates/cli/src/opts/ethereum.rs similarity index 100% rename from cli/src/opts/ethereum.rs rename to crates/cli/src/opts/ethereum.rs diff --git a/cli/src/opts/mod.rs b/crates/cli/src/opts/mod.rs similarity index 100% rename from cli/src/opts/mod.rs rename to crates/cli/src/opts/mod.rs diff --git a/cli/src/opts/transaction.rs b/crates/cli/src/opts/transaction.rs similarity index 100% rename from cli/src/opts/transaction.rs rename to crates/cli/src/opts/transaction.rs diff --git a/cli/src/opts/wallet/error.rs b/crates/cli/src/opts/wallet/error.rs similarity index 100% rename from cli/src/opts/wallet/error.rs rename to crates/cli/src/opts/wallet/error.rs diff --git a/cli/src/opts/wallet/mod.rs b/crates/cli/src/opts/wallet/mod.rs similarity index 100% rename from cli/src/opts/wallet/mod.rs rename to crates/cli/src/opts/wallet/mod.rs diff --git a/cli/src/opts/wallet/multi_wallet.rs b/crates/cli/src/opts/wallet/multi_wallet.rs similarity index 100% rename from cli/src/opts/wallet/multi_wallet.rs rename to crates/cli/src/opts/wallet/multi_wallet.rs diff --git a/cli/src/stdin.rs b/crates/cli/src/stdin.rs similarity index 100% rename from cli/src/stdin.rs rename to crates/cli/src/stdin.rs diff --git a/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs similarity index 100% rename from cli/src/utils/cmd.rs rename to crates/cli/src/utils/cmd.rs diff --git a/cli/src/utils/mod.rs b/crates/cli/src/utils/mod.rs similarity index 100% rename from cli/src/utils/mod.rs rename to crates/cli/src/utils/mod.rs diff --git a/cli/src/utils/suggestions.rs b/crates/cli/src/utils/suggestions.rs similarity index 100% rename from cli/src/utils/suggestions.rs rename to crates/cli/src/utils/suggestions.rs diff --git a/cli/test-utils/Cargo.toml b/crates/cli/test-utils/Cargo.toml similarity index 100% rename from cli/test-utils/Cargo.toml rename to crates/cli/test-utils/Cargo.toml diff --git a/cli/test-utils/src/lib.rs b/crates/cli/test-utils/src/lib.rs similarity index 100% rename from cli/test-utils/src/lib.rs rename to crates/cli/test-utils/src/lib.rs diff --git a/cli/test-utils/src/macros.rs b/crates/cli/test-utils/src/macros.rs similarity index 100% rename from cli/test-utils/src/macros.rs rename to crates/cli/test-utils/src/macros.rs diff --git a/cli/test-utils/src/script.rs b/crates/cli/test-utils/src/script.rs similarity index 99% rename from cli/test-utils/src/script.rs rename to crates/cli/test-utils/src/script.rs index 8411532ed757a..16e74c8e81259 100644 --- a/cli/test-utils/src/script.rs +++ b/crates/cli/test-utils/src/script.rs @@ -92,7 +92,7 @@ impl ScriptTester { /// Returns the path to the dir that contains testdata fn testdata_path() -> String { - format!("{}/../../testdata", env!("CARGO_MANIFEST_DIR")) + format!("{}/../../../testdata", env!("CARGO_MANIFEST_DIR")) } /// Initialises the test contracts by copying them into the workspace diff --git a/cli/test-utils/src/util.rs b/crates/cli/test-utils/src/util.rs similarity index 99% rename from cli/test-utils/src/util.rs rename to crates/cli/test-utils/src/util.rs index 886847ff9c149..b51d915bc3958 100644 --- a/cli/test-utils/src/util.rs +++ b/crates/cli/test-utils/src/util.rs @@ -322,13 +322,13 @@ impl TestProject { /// Adds DSTest as a source under "test.sol" pub fn insert_ds_test(&self) -> PathBuf { - let s = include_str!("../../../testdata/lib/ds-test/src/test.sol"); + let s = include_str!("../../../../testdata/lib/ds-test/src/test.sol"); self.inner().add_source("test.sol", s).unwrap() } /// Adds `console.sol` as a source under "console.sol" pub fn insert_console(&self) -> PathBuf { - let s = include_str!("../../../testdata/logs/console.sol"); + let s = include_str!("../../../../testdata/logs/console.sol"); self.inner().add_source("console.sol", s).unwrap() } diff --git a/cli/tests/fixtures/ERC20Artifact.json b/crates/cli/tests/fixtures/ERC20Artifact.json similarity index 100% rename from cli/tests/fixtures/ERC20Artifact.json rename to crates/cli/tests/fixtures/ERC20Artifact.json diff --git a/cli/tests/fixtures/ScriptVerify.sol b/crates/cli/tests/fixtures/ScriptVerify.sol similarity index 100% rename from cli/tests/fixtures/ScriptVerify.sol rename to crates/cli/tests/fixtures/ScriptVerify.sol diff --git a/cli/tests/fixtures/can_build_skip_contracts.stdout b/crates/cli/tests/fixtures/can_build_skip_contracts.stdout similarity index 100% rename from cli/tests/fixtures/can_build_skip_contracts.stdout rename to crates/cli/tests/fixtures/can_build_skip_contracts.stdout diff --git a/cli/tests/fixtures/can_build_skip_glob.stdout b/crates/cli/tests/fixtures/can_build_skip_glob.stdout similarity index 100% rename from cli/tests/fixtures/can_build_skip_glob.stdout rename to crates/cli/tests/fixtures/can_build_skip_glob.stdout diff --git a/cli/tests/fixtures/can_check_snapshot.stdout b/crates/cli/tests/fixtures/can_check_snapshot.stdout similarity index 100% rename from cli/tests/fixtures/can_check_snapshot.stdout rename to crates/cli/tests/fixtures/can_check_snapshot.stdout diff --git a/cli/tests/fixtures/can_create_template_contract-2nd.stdout b/crates/cli/tests/fixtures/can_create_template_contract-2nd.stdout similarity index 100% rename from cli/tests/fixtures/can_create_template_contract-2nd.stdout rename to crates/cli/tests/fixtures/can_create_template_contract-2nd.stdout diff --git a/cli/tests/fixtures/can_create_template_contract.stdout b/crates/cli/tests/fixtures/can_create_template_contract.stdout similarity index 100% rename from cli/tests/fixtures/can_create_template_contract.stdout rename to crates/cli/tests/fixtures/can_create_template_contract.stdout diff --git a/cli/tests/fixtures/can_create_using_unlocked-2nd.stdout b/crates/cli/tests/fixtures/can_create_using_unlocked-2nd.stdout similarity index 100% rename from cli/tests/fixtures/can_create_using_unlocked-2nd.stdout rename to crates/cli/tests/fixtures/can_create_using_unlocked-2nd.stdout diff --git a/cli/tests/fixtures/can_create_using_unlocked.stdout b/crates/cli/tests/fixtures/can_create_using_unlocked.stdout similarity index 100% rename from cli/tests/fixtures/can_create_using_unlocked.stdout rename to crates/cli/tests/fixtures/can_create_using_unlocked.stdout diff --git a/cli/tests/fixtures/can_detect_dirty_git_status_on_init.stderr b/crates/cli/tests/fixtures/can_detect_dirty_git_status_on_init.stderr similarity index 100% rename from cli/tests/fixtures/can_detect_dirty_git_status_on_init.stderr rename to crates/cli/tests/fixtures/can_detect_dirty_git_status_on_init.stderr diff --git a/cli/tests/fixtures/can_execute_script_and_skip_contracts.stdout b/crates/cli/tests/fixtures/can_execute_script_and_skip_contracts.stdout similarity index 100% rename from cli/tests/fixtures/can_execute_script_and_skip_contracts.stdout rename to crates/cli/tests/fixtures/can_execute_script_and_skip_contracts.stdout diff --git a/cli/tests/fixtures/can_execute_script_command.stdout b/crates/cli/tests/fixtures/can_execute_script_command.stdout similarity index 100% rename from cli/tests/fixtures/can_execute_script_command.stdout rename to crates/cli/tests/fixtures/can_execute_script_command.stdout diff --git a/cli/tests/fixtures/can_execute_script_command_fqn.stdout b/crates/cli/tests/fixtures/can_execute_script_command_fqn.stdout similarity index 100% rename from cli/tests/fixtures/can_execute_script_command_fqn.stdout rename to crates/cli/tests/fixtures/can_execute_script_command_fqn.stdout diff --git a/cli/tests/fixtures/can_execute_script_command_with_args.stdout b/crates/cli/tests/fixtures/can_execute_script_command_with_args.stdout similarity index 100% rename from cli/tests/fixtures/can_execute_script_command_with_args.stdout rename to crates/cli/tests/fixtures/can_execute_script_command_with_args.stdout diff --git a/cli/tests/fixtures/can_execute_script_command_with_returned.stdout b/crates/cli/tests/fixtures/can_execute_script_command_with_returned.stdout similarity index 100% rename from cli/tests/fixtures/can_execute_script_command_with_returned.stdout rename to crates/cli/tests/fixtures/can_execute_script_command_with_returned.stdout diff --git a/cli/tests/fixtures/can_execute_script_command_with_sig.stdout b/crates/cli/tests/fixtures/can_execute_script_command_with_sig.stdout similarity index 100% rename from cli/tests/fixtures/can_execute_script_command_with_sig.stdout rename to crates/cli/tests/fixtures/can_execute_script_command_with_sig.stdout diff --git a/cli/tests/fixtures/can_run_test_in_custom_test_folder.stdout b/crates/cli/tests/fixtures/can_run_test_in_custom_test_folder.stdout similarity index 100% rename from cli/tests/fixtures/can_run_test_in_custom_test_folder.stdout rename to crates/cli/tests/fixtures/can_run_test_in_custom_test_folder.stdout diff --git a/cli/tests/fixtures/can_set_yul_optimizer.stderr b/crates/cli/tests/fixtures/can_set_yul_optimizer.stderr similarity index 100% rename from cli/tests/fixtures/can_set_yul_optimizer.stderr rename to crates/cli/tests/fixtures/can_set_yul_optimizer.stderr diff --git a/cli/tests/fixtures/can_test_repeatedly.stdout b/crates/cli/tests/fixtures/can_test_repeatedly.stdout similarity index 100% rename from cli/tests/fixtures/can_test_repeatedly.stdout rename to crates/cli/tests/fixtures/can_test_repeatedly.stdout diff --git a/cli/tests/fixtures/can_use_libs_in_multi_fork.stdout b/crates/cli/tests/fixtures/can_use_libs_in_multi_fork.stdout similarity index 100% rename from cli/tests/fixtures/can_use_libs_in_multi_fork.stdout rename to crates/cli/tests/fixtures/can_use_libs_in_multi_fork.stdout diff --git a/cli/tests/fixtures/cast_logs.stdout b/crates/cli/tests/fixtures/cast_logs.stdout similarity index 100% rename from cli/tests/fixtures/cast_logs.stdout rename to crates/cli/tests/fixtures/cast_logs.stdout diff --git a/cli/tests/fixtures/keystore/UTC--2022-10-30T06-51-20.130356000Z--560d246fcddc9ea98a8b032c9a2f474efb493c28 b/crates/cli/tests/fixtures/keystore/UTC--2022-10-30T06-51-20.130356000Z--560d246fcddc9ea98a8b032c9a2f474efb493c28 similarity index 100% rename from cli/tests/fixtures/keystore/UTC--2022-10-30T06-51-20.130356000Z--560d246fcddc9ea98a8b032c9a2f474efb493c28 rename to crates/cli/tests/fixtures/keystore/UTC--2022-10-30T06-51-20.130356000Z--560d246fcddc9ea98a8b032c9a2f474efb493c28 diff --git a/cli/tests/fixtures/keystore/UTC--2022-12-20T10-30-43.591916000Z--ec554aeafe75601aaab43bd4621a22284db566c2 b/crates/cli/tests/fixtures/keystore/UTC--2022-12-20T10-30-43.591916000Z--ec554aeafe75601aaab43bd4621a22284db566c2 similarity index 100% rename from cli/tests/fixtures/keystore/UTC--2022-12-20T10-30-43.591916000Z--ec554aeafe75601aaab43bd4621a22284db566c2 rename to crates/cli/tests/fixtures/keystore/UTC--2022-12-20T10-30-43.591916000Z--ec554aeafe75601aaab43bd4621a22284db566c2 diff --git a/cli/tests/fixtures/keystore/password b/crates/cli/tests/fixtures/keystore/password similarity index 100% rename from cli/tests/fixtures/keystore/password rename to crates/cli/tests/fixtures/keystore/password diff --git a/cli/tests/fixtures/keystore/password-ec554 b/crates/cli/tests/fixtures/keystore/password-ec554 similarity index 100% rename from cli/tests/fixtures/keystore/password-ec554 rename to crates/cli/tests/fixtures/keystore/password-ec554 diff --git a/cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.10.stdout b/crates/cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.10.stdout similarity index 100% rename from cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.10.stdout rename to crates/cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.10.stdout diff --git a/cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.13.stdout b/crates/cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.13.stdout similarity index 100% rename from cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.13.stdout rename to crates/cli/tests/fixtures/runs_tests_exactly_once_with_changed_versions.0.8.13.stdout diff --git a/cli/tests/fixtures/sign_typed_data.json b/crates/cli/tests/fixtures/sign_typed_data.json similarity index 100% rename from cli/tests/fixtures/sign_typed_data.json rename to crates/cli/tests/fixtures/sign_typed_data.json diff --git a/cli/tests/fixtures/suggest_when_no_tests_match.stdout b/crates/cli/tests/fixtures/suggest_when_no_tests_match.stdout similarity index 100% rename from cli/tests/fixtures/suggest_when_no_tests_match.stdout rename to crates/cli/tests/fixtures/suggest_when_no_tests_match.stdout diff --git a/cli/tests/fixtures/warn_no_tests.stdout b/crates/cli/tests/fixtures/warn_no_tests.stdout similarity index 100% rename from cli/tests/fixtures/warn_no_tests.stdout rename to crates/cli/tests/fixtures/warn_no_tests.stdout diff --git a/cli/tests/fixtures/warn_no_tests_match.stdout b/crates/cli/tests/fixtures/warn_no_tests_match.stdout similarity index 100% rename from cli/tests/fixtures/warn_no_tests_match.stdout rename to crates/cli/tests/fixtures/warn_no_tests_match.stdout diff --git a/cli/tests/it/cache.rs b/crates/cli/tests/it/cache.rs similarity index 100% rename from cli/tests/it/cache.rs rename to crates/cli/tests/it/cache.rs diff --git a/cli/tests/it/cast.rs b/crates/cli/tests/it/cast.rs similarity index 100% rename from cli/tests/it/cast.rs rename to crates/cli/tests/it/cast.rs diff --git a/cli/tests/it/cmd.rs b/crates/cli/tests/it/cmd.rs similarity index 100% rename from cli/tests/it/cmd.rs rename to crates/cli/tests/it/cmd.rs diff --git a/cli/tests/it/config.rs b/crates/cli/tests/it/config.rs similarity index 100% rename from cli/tests/it/config.rs rename to crates/cli/tests/it/config.rs diff --git a/cli/tests/it/constants.rs b/crates/cli/tests/it/constants.rs similarity index 100% rename from cli/tests/it/constants.rs rename to crates/cli/tests/it/constants.rs diff --git a/cli/tests/it/create.rs b/crates/cli/tests/it/create.rs similarity index 100% rename from cli/tests/it/create.rs rename to crates/cli/tests/it/create.rs diff --git a/cli/tests/it/doc.rs b/crates/cli/tests/it/doc.rs similarity index 100% rename from cli/tests/it/doc.rs rename to crates/cli/tests/it/doc.rs diff --git a/cli/tests/it/integration.rs b/crates/cli/tests/it/integration.rs similarity index 100% rename from cli/tests/it/integration.rs rename to crates/cli/tests/it/integration.rs diff --git a/cli/tests/it/main.rs b/crates/cli/tests/it/main.rs similarity index 100% rename from cli/tests/it/main.rs rename to crates/cli/tests/it/main.rs diff --git a/cli/tests/it/multi_script.rs b/crates/cli/tests/it/multi_script.rs similarity index 100% rename from cli/tests/it/multi_script.rs rename to crates/cli/tests/it/multi_script.rs diff --git a/cli/tests/it/script.rs b/crates/cli/tests/it/script.rs similarity index 99% rename from cli/tests/it/script.rs rename to crates/cli/tests/it/script.rs index b21f505cce32d..2393f5fe44e88 100644 --- a/cli/tests/it/script.rs +++ b/crates/cli/tests/it/script.rs @@ -710,8 +710,8 @@ forgetest_async!( // Uncomment to recreate the broadcast log // std::fs::copy( // "broadcast/Broadcast.t.sol/31337/run-latest.json", - // PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../testdata/fixtures/broadcast.log. - // json" ), ); + // PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../testdata/fixtures/broadcast. + // log. json" ), ); // Check broadcast logs // Ignore timestamp, blockHash, blockNumber, cumulativeGasUsed, effectiveGasPrice, @@ -720,7 +720,7 @@ forgetest_async!( let fixtures_log = std::fs::read_to_string( PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("../testdata/fixtures/broadcast.log.json"), + .join("../../testdata/fixtures/broadcast.log.json"), ) .unwrap(); let _fixtures_log = re.replace_all(&fixtures_log, ""); @@ -735,7 +735,7 @@ forgetest_async!( // std::fs::copy( // "cache/Broadcast.t.sol/31337/run-latest.json", // PathBuf::from(env!("CARGO_MANIFEST_DIR")) - // .join("../testdata/fixtures/broadcast.sensitive.log.json"), + // .join("../../testdata/fixtures/broadcast.sensitive.log.json"), // ); // Check sensitive logs @@ -744,7 +744,7 @@ forgetest_async!( let fixtures_log = std::fs::read_to_string( PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("../testdata/fixtures/broadcast.sensitive.log.json"), + .join("../../testdata/fixtures/broadcast.sensitive.log.json"), ) .unwrap(); let fixtures_log = re.replace_all(&fixtures_log, ""); diff --git a/cli/tests/it/svm.rs b/crates/cli/tests/it/svm.rs similarity index 100% rename from cli/tests/it/svm.rs rename to crates/cli/tests/it/svm.rs diff --git a/cli/tests/it/test_cmd.rs b/crates/cli/tests/it/test_cmd.rs similarity index 100% rename from cli/tests/it/test_cmd.rs rename to crates/cli/tests/it/test_cmd.rs diff --git a/cli/tests/it/utils.rs b/crates/cli/tests/it/utils.rs similarity index 100% rename from cli/tests/it/utils.rs rename to crates/cli/tests/it/utils.rs diff --git a/cli/tests/it/verify.rs b/crates/cli/tests/it/verify.rs similarity index 100% rename from cli/tests/it/verify.rs rename to crates/cli/tests/it/verify.rs diff --git a/cli/tests/rpc-cache-keyfile b/crates/cli/tests/rpc-cache-keyfile similarity index 100% rename from cli/tests/rpc-cache-keyfile rename to crates/cli/tests/rpc-cache-keyfile diff --git a/common/Cargo.toml b/crates/common/Cargo.toml similarity index 100% rename from common/Cargo.toml rename to crates/common/Cargo.toml diff --git a/common/README.md b/crates/common/README.md similarity index 100% rename from common/README.md rename to crates/common/README.md diff --git a/common/src/abi.rs b/crates/common/src/abi.rs similarity index 100% rename from common/src/abi.rs rename to crates/common/src/abi.rs diff --git a/common/src/calc.rs b/crates/common/src/calc.rs similarity index 100% rename from common/src/calc.rs rename to crates/common/src/calc.rs diff --git a/common/src/clap_helpers.rs b/crates/common/src/clap_helpers.rs similarity index 100% rename from common/src/clap_helpers.rs rename to crates/common/src/clap_helpers.rs diff --git a/common/src/compile.rs b/crates/common/src/compile.rs similarity index 100% rename from common/src/compile.rs rename to crates/common/src/compile.rs diff --git a/common/src/constants.rs b/crates/common/src/constants.rs similarity index 100% rename from common/src/constants.rs rename to crates/common/src/constants.rs diff --git a/common/src/contracts.rs b/crates/common/src/contracts.rs similarity index 100% rename from common/src/contracts.rs rename to crates/common/src/contracts.rs diff --git a/common/src/errors/artifacts.rs b/crates/common/src/errors/artifacts.rs similarity index 100% rename from common/src/errors/artifacts.rs rename to crates/common/src/errors/artifacts.rs diff --git a/common/src/errors/fs.rs b/crates/common/src/errors/fs.rs similarity index 100% rename from common/src/errors/fs.rs rename to crates/common/src/errors/fs.rs diff --git a/common/src/errors/mod.rs b/crates/common/src/errors/mod.rs similarity index 100% rename from common/src/errors/mod.rs rename to crates/common/src/errors/mod.rs diff --git a/common/src/evm.rs b/crates/common/src/evm.rs similarity index 100% rename from common/src/evm.rs rename to crates/common/src/evm.rs diff --git a/common/src/fmt.rs b/crates/common/src/fmt.rs similarity index 100% rename from common/src/fmt.rs rename to crates/common/src/fmt.rs diff --git a/common/src/fs.rs b/crates/common/src/fs.rs similarity index 100% rename from common/src/fs.rs rename to crates/common/src/fs.rs diff --git a/common/src/glob.rs b/crates/common/src/glob.rs similarity index 100% rename from common/src/glob.rs rename to crates/common/src/glob.rs diff --git a/common/src/lib.rs b/crates/common/src/lib.rs similarity index 100% rename from common/src/lib.rs rename to crates/common/src/lib.rs diff --git a/common/src/provider.rs b/crates/common/src/provider.rs similarity index 100% rename from common/src/provider.rs rename to crates/common/src/provider.rs diff --git a/common/src/selectors.rs b/crates/common/src/selectors.rs similarity index 100% rename from common/src/selectors.rs rename to crates/common/src/selectors.rs diff --git a/common/src/shell.rs b/crates/common/src/shell.rs similarity index 100% rename from common/src/shell.rs rename to crates/common/src/shell.rs diff --git a/common/src/term.rs b/crates/common/src/term.rs similarity index 100% rename from common/src/term.rs rename to crates/common/src/term.rs diff --git a/common/src/traits.rs b/crates/common/src/traits.rs similarity index 100% rename from common/src/traits.rs rename to crates/common/src/traits.rs diff --git a/common/src/transactions.rs b/crates/common/src/transactions.rs similarity index 100% rename from common/src/transactions.rs rename to crates/common/src/transactions.rs diff --git a/config/Cargo.toml b/crates/config/Cargo.toml similarity index 100% rename from config/Cargo.toml rename to crates/config/Cargo.toml diff --git a/config/README.md b/crates/config/README.md similarity index 100% rename from config/README.md rename to crates/config/README.md diff --git a/config/src/cache.rs b/crates/config/src/cache.rs similarity index 100% rename from config/src/cache.rs rename to crates/config/src/cache.rs diff --git a/config/src/chain.rs b/crates/config/src/chain.rs similarity index 100% rename from config/src/chain.rs rename to crates/config/src/chain.rs diff --git a/config/src/doc.rs b/crates/config/src/doc.rs similarity index 100% rename from config/src/doc.rs rename to crates/config/src/doc.rs diff --git a/config/src/endpoints.rs b/crates/config/src/endpoints.rs similarity index 100% rename from config/src/endpoints.rs rename to crates/config/src/endpoints.rs diff --git a/config/src/error.rs b/crates/config/src/error.rs similarity index 100% rename from config/src/error.rs rename to crates/config/src/error.rs diff --git a/config/src/etherscan.rs b/crates/config/src/etherscan.rs similarity index 100% rename from config/src/etherscan.rs rename to crates/config/src/etherscan.rs diff --git a/config/src/fix.rs b/crates/config/src/fix.rs similarity index 100% rename from config/src/fix.rs rename to crates/config/src/fix.rs diff --git a/config/src/fmt.rs b/crates/config/src/fmt.rs similarity index 100% rename from config/src/fmt.rs rename to crates/config/src/fmt.rs diff --git a/config/src/fs_permissions.rs b/crates/config/src/fs_permissions.rs similarity index 100% rename from config/src/fs_permissions.rs rename to crates/config/src/fs_permissions.rs diff --git a/config/src/fuzz.rs b/crates/config/src/fuzz.rs similarity index 100% rename from config/src/fuzz.rs rename to crates/config/src/fuzz.rs diff --git a/config/src/inline/conf_parser.rs b/crates/config/src/inline/conf_parser.rs similarity index 100% rename from config/src/inline/conf_parser.rs rename to crates/config/src/inline/conf_parser.rs diff --git a/config/src/inline/mod.rs b/crates/config/src/inline/mod.rs similarity index 100% rename from config/src/inline/mod.rs rename to crates/config/src/inline/mod.rs diff --git a/config/src/inline/natspec.rs b/crates/config/src/inline/natspec.rs similarity index 100% rename from config/src/inline/natspec.rs rename to crates/config/src/inline/natspec.rs diff --git a/config/src/invariant.rs b/crates/config/src/invariant.rs similarity index 100% rename from config/src/invariant.rs rename to crates/config/src/invariant.rs diff --git a/config/src/lib.rs b/crates/config/src/lib.rs similarity index 100% rename from config/src/lib.rs rename to crates/config/src/lib.rs diff --git a/config/src/macros.rs b/crates/config/src/macros.rs similarity index 100% rename from config/src/macros.rs rename to crates/config/src/macros.rs diff --git a/config/src/providers/mod.rs b/crates/config/src/providers/mod.rs similarity index 100% rename from config/src/providers/mod.rs rename to crates/config/src/providers/mod.rs diff --git a/config/src/providers/remappings.rs b/crates/config/src/providers/remappings.rs similarity index 100% rename from config/src/providers/remappings.rs rename to crates/config/src/providers/remappings.rs diff --git a/config/src/resolve.rs b/crates/config/src/resolve.rs similarity index 100% rename from config/src/resolve.rs rename to crates/config/src/resolve.rs diff --git a/config/src/utils.rs b/crates/config/src/utils.rs similarity index 100% rename from config/src/utils.rs rename to crates/config/src/utils.rs diff --git a/config/src/warning.rs b/crates/config/src/warning.rs similarity index 100% rename from config/src/warning.rs rename to crates/config/src/warning.rs diff --git a/doc/Cargo.toml b/crates/doc/Cargo.toml similarity index 100% rename from doc/Cargo.toml rename to crates/doc/Cargo.toml diff --git a/doc/README.md b/crates/doc/README.md similarity index 100% rename from doc/README.md rename to crates/doc/README.md diff --git a/doc/src/builder.rs b/crates/doc/src/builder.rs similarity index 100% rename from doc/src/builder.rs rename to crates/doc/src/builder.rs diff --git a/doc/src/document.rs b/crates/doc/src/document.rs similarity index 100% rename from doc/src/document.rs rename to crates/doc/src/document.rs diff --git a/doc/src/helpers.rs b/crates/doc/src/helpers.rs similarity index 100% rename from doc/src/helpers.rs rename to crates/doc/src/helpers.rs diff --git a/doc/src/lib.rs b/crates/doc/src/lib.rs similarity index 100% rename from doc/src/lib.rs rename to crates/doc/src/lib.rs diff --git a/doc/src/parser/comment.rs b/crates/doc/src/parser/comment.rs similarity index 100% rename from doc/src/parser/comment.rs rename to crates/doc/src/parser/comment.rs diff --git a/doc/src/parser/error.rs b/crates/doc/src/parser/error.rs similarity index 100% rename from doc/src/parser/error.rs rename to crates/doc/src/parser/error.rs diff --git a/doc/src/parser/item.rs b/crates/doc/src/parser/item.rs similarity index 100% rename from doc/src/parser/item.rs rename to crates/doc/src/parser/item.rs diff --git a/doc/src/parser/mod.rs b/crates/doc/src/parser/mod.rs similarity index 100% rename from doc/src/parser/mod.rs rename to crates/doc/src/parser/mod.rs diff --git a/doc/src/preprocessor/contract_inheritance.rs b/crates/doc/src/preprocessor/contract_inheritance.rs similarity index 100% rename from doc/src/preprocessor/contract_inheritance.rs rename to crates/doc/src/preprocessor/contract_inheritance.rs diff --git a/doc/src/preprocessor/deployments.rs b/crates/doc/src/preprocessor/deployments.rs similarity index 100% rename from doc/src/preprocessor/deployments.rs rename to crates/doc/src/preprocessor/deployments.rs diff --git a/doc/src/preprocessor/git_source.rs b/crates/doc/src/preprocessor/git_source.rs similarity index 100% rename from doc/src/preprocessor/git_source.rs rename to crates/doc/src/preprocessor/git_source.rs diff --git a/doc/src/preprocessor/inheritdoc.rs b/crates/doc/src/preprocessor/inheritdoc.rs similarity index 100% rename from doc/src/preprocessor/inheritdoc.rs rename to crates/doc/src/preprocessor/inheritdoc.rs diff --git a/doc/src/preprocessor/mod.rs b/crates/doc/src/preprocessor/mod.rs similarity index 100% rename from doc/src/preprocessor/mod.rs rename to crates/doc/src/preprocessor/mod.rs diff --git a/doc/src/server.rs b/crates/doc/src/server.rs similarity index 100% rename from doc/src/server.rs rename to crates/doc/src/server.rs diff --git a/doc/src/writer/as_doc.rs b/crates/doc/src/writer/as_doc.rs similarity index 100% rename from doc/src/writer/as_doc.rs rename to crates/doc/src/writer/as_doc.rs diff --git a/doc/src/writer/buf_writer.rs b/crates/doc/src/writer/buf_writer.rs similarity index 100% rename from doc/src/writer/buf_writer.rs rename to crates/doc/src/writer/buf_writer.rs diff --git a/doc/src/writer/markdown.rs b/crates/doc/src/writer/markdown.rs similarity index 100% rename from doc/src/writer/markdown.rs rename to crates/doc/src/writer/markdown.rs diff --git a/doc/src/writer/mod.rs b/crates/doc/src/writer/mod.rs similarity index 100% rename from doc/src/writer/mod.rs rename to crates/doc/src/writer/mod.rs diff --git a/doc/static/book.css b/crates/doc/static/book.css similarity index 100% rename from doc/static/book.css rename to crates/doc/static/book.css diff --git a/doc/static/book.toml b/crates/doc/static/book.toml similarity index 100% rename from doc/static/book.toml rename to crates/doc/static/book.toml diff --git a/doc/static/solidity.min.js b/crates/doc/static/solidity.min.js similarity index 100% rename from doc/static/solidity.min.js rename to crates/doc/static/solidity.min.js diff --git a/evm/Cargo.toml b/crates/evm/Cargo.toml similarity index 100% rename from evm/Cargo.toml rename to crates/evm/Cargo.toml diff --git a/evm/src/coverage/analysis.rs b/crates/evm/src/coverage/analysis.rs similarity index 100% rename from evm/src/coverage/analysis.rs rename to crates/evm/src/coverage/analysis.rs diff --git a/evm/src/coverage/anchors.rs b/crates/evm/src/coverage/anchors.rs similarity index 100% rename from evm/src/coverage/anchors.rs rename to crates/evm/src/coverage/anchors.rs diff --git a/evm/src/coverage/mod.rs b/crates/evm/src/coverage/mod.rs similarity index 100% rename from evm/src/coverage/mod.rs rename to crates/evm/src/coverage/mod.rs diff --git a/evm/src/debug.rs b/crates/evm/src/debug.rs similarity index 100% rename from evm/src/debug.rs rename to crates/evm/src/debug.rs diff --git a/evm/src/decode.rs b/crates/evm/src/decode.rs similarity index 100% rename from evm/src/decode.rs rename to crates/evm/src/decode.rs diff --git a/evm/src/executor/abi/mod.rs b/crates/evm/src/executor/abi/mod.rs similarity index 100% rename from evm/src/executor/abi/mod.rs rename to crates/evm/src/executor/abi/mod.rs diff --git a/evm/src/executor/backend/diagnostic.rs b/crates/evm/src/executor/backend/diagnostic.rs similarity index 100% rename from evm/src/executor/backend/diagnostic.rs rename to crates/evm/src/executor/backend/diagnostic.rs diff --git a/evm/src/executor/backend/error.rs b/crates/evm/src/executor/backend/error.rs similarity index 100% rename from evm/src/executor/backend/error.rs rename to crates/evm/src/executor/backend/error.rs diff --git a/evm/src/executor/backend/fuzz.rs b/crates/evm/src/executor/backend/fuzz.rs similarity index 100% rename from evm/src/executor/backend/fuzz.rs rename to crates/evm/src/executor/backend/fuzz.rs diff --git a/evm/src/executor/backend/in_memory_db.rs b/crates/evm/src/executor/backend/in_memory_db.rs similarity index 100% rename from evm/src/executor/backend/in_memory_db.rs rename to crates/evm/src/executor/backend/in_memory_db.rs diff --git a/evm/src/executor/backend/mod.rs b/crates/evm/src/executor/backend/mod.rs similarity index 100% rename from evm/src/executor/backend/mod.rs rename to crates/evm/src/executor/backend/mod.rs diff --git a/evm/src/executor/backend/snapshot.rs b/crates/evm/src/executor/backend/snapshot.rs similarity index 100% rename from evm/src/executor/backend/snapshot.rs rename to crates/evm/src/executor/backend/snapshot.rs diff --git a/evm/src/executor/builder.rs b/crates/evm/src/executor/builder.rs similarity index 100% rename from evm/src/executor/builder.rs rename to crates/evm/src/executor/builder.rs diff --git a/evm/src/executor/fork/backend.rs b/crates/evm/src/executor/fork/backend.rs similarity index 100% rename from evm/src/executor/fork/backend.rs rename to crates/evm/src/executor/fork/backend.rs diff --git a/evm/src/executor/fork/cache.rs b/crates/evm/src/executor/fork/cache.rs similarity index 100% rename from evm/src/executor/fork/cache.rs rename to crates/evm/src/executor/fork/cache.rs diff --git a/evm/src/executor/fork/database.rs b/crates/evm/src/executor/fork/database.rs similarity index 100% rename from evm/src/executor/fork/database.rs rename to crates/evm/src/executor/fork/database.rs diff --git a/evm/src/executor/fork/init.rs b/crates/evm/src/executor/fork/init.rs similarity index 100% rename from evm/src/executor/fork/init.rs rename to crates/evm/src/executor/fork/init.rs diff --git a/evm/src/executor/fork/mod.rs b/crates/evm/src/executor/fork/mod.rs similarity index 100% rename from evm/src/executor/fork/mod.rs rename to crates/evm/src/executor/fork/mod.rs diff --git a/evm/src/executor/fork/multi.rs b/crates/evm/src/executor/fork/multi.rs similarity index 100% rename from evm/src/executor/fork/multi.rs rename to crates/evm/src/executor/fork/multi.rs diff --git a/evm/src/executor/inspector/access_list.rs b/crates/evm/src/executor/inspector/access_list.rs similarity index 100% rename from evm/src/executor/inspector/access_list.rs rename to crates/evm/src/executor/inspector/access_list.rs diff --git a/evm/src/executor/inspector/cheatcodes/config.rs b/crates/evm/src/executor/inspector/cheatcodes/config.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/config.rs rename to crates/evm/src/executor/inspector/cheatcodes/config.rs diff --git a/evm/src/executor/inspector/cheatcodes/env.rs b/crates/evm/src/executor/inspector/cheatcodes/env.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/env.rs rename to crates/evm/src/executor/inspector/cheatcodes/env.rs diff --git a/evm/src/executor/inspector/cheatcodes/error.rs b/crates/evm/src/executor/inspector/cheatcodes/error.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/error.rs rename to crates/evm/src/executor/inspector/cheatcodes/error.rs diff --git a/evm/src/executor/inspector/cheatcodes/expect.rs b/crates/evm/src/executor/inspector/cheatcodes/expect.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/expect.rs rename to crates/evm/src/executor/inspector/cheatcodes/expect.rs diff --git a/evm/src/executor/inspector/cheatcodes/ext.rs b/crates/evm/src/executor/inspector/cheatcodes/ext.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/ext.rs rename to crates/evm/src/executor/inspector/cheatcodes/ext.rs diff --git a/evm/src/executor/inspector/cheatcodes/fork.rs b/crates/evm/src/executor/inspector/cheatcodes/fork.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/fork.rs rename to crates/evm/src/executor/inspector/cheatcodes/fork.rs diff --git a/evm/src/executor/inspector/cheatcodes/fs.rs b/crates/evm/src/executor/inspector/cheatcodes/fs.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/fs.rs rename to crates/evm/src/executor/inspector/cheatcodes/fs.rs diff --git a/evm/src/executor/inspector/cheatcodes/fuzz.rs b/crates/evm/src/executor/inspector/cheatcodes/fuzz.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/fuzz.rs rename to crates/evm/src/executor/inspector/cheatcodes/fuzz.rs diff --git a/evm/src/executor/inspector/cheatcodes/mapping.rs b/crates/evm/src/executor/inspector/cheatcodes/mapping.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/mapping.rs rename to crates/evm/src/executor/inspector/cheatcodes/mapping.rs diff --git a/evm/src/executor/inspector/cheatcodes/mod.rs b/crates/evm/src/executor/inspector/cheatcodes/mod.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/mod.rs rename to crates/evm/src/executor/inspector/cheatcodes/mod.rs diff --git a/evm/src/executor/inspector/cheatcodes/snapshot.rs b/crates/evm/src/executor/inspector/cheatcodes/snapshot.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/snapshot.rs rename to crates/evm/src/executor/inspector/cheatcodes/snapshot.rs diff --git a/evm/src/executor/inspector/cheatcodes/util.rs b/crates/evm/src/executor/inspector/cheatcodes/util.rs similarity index 100% rename from evm/src/executor/inspector/cheatcodes/util.rs rename to crates/evm/src/executor/inspector/cheatcodes/util.rs diff --git a/evm/src/executor/inspector/chisel_state.rs b/crates/evm/src/executor/inspector/chisel_state.rs similarity index 100% rename from evm/src/executor/inspector/chisel_state.rs rename to crates/evm/src/executor/inspector/chisel_state.rs diff --git a/evm/src/executor/inspector/coverage.rs b/crates/evm/src/executor/inspector/coverage.rs similarity index 100% rename from evm/src/executor/inspector/coverage.rs rename to crates/evm/src/executor/inspector/coverage.rs diff --git a/evm/src/executor/inspector/debugger.rs b/crates/evm/src/executor/inspector/debugger.rs similarity index 100% rename from evm/src/executor/inspector/debugger.rs rename to crates/evm/src/executor/inspector/debugger.rs diff --git a/evm/src/executor/inspector/fuzzer.rs b/crates/evm/src/executor/inspector/fuzzer.rs similarity index 100% rename from evm/src/executor/inspector/fuzzer.rs rename to crates/evm/src/executor/inspector/fuzzer.rs diff --git a/evm/src/executor/inspector/logs.rs b/crates/evm/src/executor/inspector/logs.rs similarity index 100% rename from evm/src/executor/inspector/logs.rs rename to crates/evm/src/executor/inspector/logs.rs diff --git a/evm/src/executor/inspector/mod.rs b/crates/evm/src/executor/inspector/mod.rs similarity index 100% rename from evm/src/executor/inspector/mod.rs rename to crates/evm/src/executor/inspector/mod.rs diff --git a/evm/src/executor/inspector/printer.rs b/crates/evm/src/executor/inspector/printer.rs similarity index 100% rename from evm/src/executor/inspector/printer.rs rename to crates/evm/src/executor/inspector/printer.rs diff --git a/evm/src/executor/inspector/stack.rs b/crates/evm/src/executor/inspector/stack.rs similarity index 100% rename from evm/src/executor/inspector/stack.rs rename to crates/evm/src/executor/inspector/stack.rs diff --git a/evm/src/executor/inspector/tracer.rs b/crates/evm/src/executor/inspector/tracer.rs similarity index 100% rename from evm/src/executor/inspector/tracer.rs rename to crates/evm/src/executor/inspector/tracer.rs diff --git a/evm/src/executor/inspector/utils.rs b/crates/evm/src/executor/inspector/utils.rs similarity index 100% rename from evm/src/executor/inspector/utils.rs rename to crates/evm/src/executor/inspector/utils.rs diff --git a/evm/src/executor/mod.rs b/crates/evm/src/executor/mod.rs similarity index 100% rename from evm/src/executor/mod.rs rename to crates/evm/src/executor/mod.rs diff --git a/evm/src/executor/opts.rs b/crates/evm/src/executor/opts.rs similarity index 100% rename from evm/src/executor/opts.rs rename to crates/evm/src/executor/opts.rs diff --git a/evm/src/executor/snapshot.rs b/crates/evm/src/executor/snapshot.rs similarity index 100% rename from evm/src/executor/snapshot.rs rename to crates/evm/src/executor/snapshot.rs diff --git a/evm/src/fuzz/error.rs b/crates/evm/src/fuzz/error.rs similarity index 100% rename from evm/src/fuzz/error.rs rename to crates/evm/src/fuzz/error.rs diff --git a/evm/src/fuzz/invariant/call_override.rs b/crates/evm/src/fuzz/invariant/call_override.rs similarity index 100% rename from evm/src/fuzz/invariant/call_override.rs rename to crates/evm/src/fuzz/invariant/call_override.rs diff --git a/evm/src/fuzz/invariant/error.rs b/crates/evm/src/fuzz/invariant/error.rs similarity index 100% rename from evm/src/fuzz/invariant/error.rs rename to crates/evm/src/fuzz/invariant/error.rs diff --git a/evm/src/fuzz/invariant/executor.rs b/crates/evm/src/fuzz/invariant/executor.rs similarity index 100% rename from evm/src/fuzz/invariant/executor.rs rename to crates/evm/src/fuzz/invariant/executor.rs diff --git a/evm/src/fuzz/invariant/filters.rs b/crates/evm/src/fuzz/invariant/filters.rs similarity index 100% rename from evm/src/fuzz/invariant/filters.rs rename to crates/evm/src/fuzz/invariant/filters.rs diff --git a/evm/src/fuzz/invariant/mod.rs b/crates/evm/src/fuzz/invariant/mod.rs similarity index 100% rename from evm/src/fuzz/invariant/mod.rs rename to crates/evm/src/fuzz/invariant/mod.rs diff --git a/evm/src/fuzz/mod.rs b/crates/evm/src/fuzz/mod.rs similarity index 100% rename from evm/src/fuzz/mod.rs rename to crates/evm/src/fuzz/mod.rs diff --git a/evm/src/fuzz/strategies/calldata.rs b/crates/evm/src/fuzz/strategies/calldata.rs similarity index 100% rename from evm/src/fuzz/strategies/calldata.rs rename to crates/evm/src/fuzz/strategies/calldata.rs diff --git a/evm/src/fuzz/strategies/int.rs b/crates/evm/src/fuzz/strategies/int.rs similarity index 100% rename from evm/src/fuzz/strategies/int.rs rename to crates/evm/src/fuzz/strategies/int.rs diff --git a/evm/src/fuzz/strategies/invariants.rs b/crates/evm/src/fuzz/strategies/invariants.rs similarity index 100% rename from evm/src/fuzz/strategies/invariants.rs rename to crates/evm/src/fuzz/strategies/invariants.rs diff --git a/evm/src/fuzz/strategies/mod.rs b/crates/evm/src/fuzz/strategies/mod.rs similarity index 100% rename from evm/src/fuzz/strategies/mod.rs rename to crates/evm/src/fuzz/strategies/mod.rs diff --git a/evm/src/fuzz/strategies/param.rs b/crates/evm/src/fuzz/strategies/param.rs similarity index 100% rename from evm/src/fuzz/strategies/param.rs rename to crates/evm/src/fuzz/strategies/param.rs diff --git a/evm/src/fuzz/strategies/state.rs b/crates/evm/src/fuzz/strategies/state.rs similarity index 100% rename from evm/src/fuzz/strategies/state.rs rename to crates/evm/src/fuzz/strategies/state.rs diff --git a/evm/src/fuzz/strategies/uint.rs b/crates/evm/src/fuzz/strategies/uint.rs similarity index 100% rename from evm/src/fuzz/strategies/uint.rs rename to crates/evm/src/fuzz/strategies/uint.rs diff --git a/evm/src/lib.rs b/crates/evm/src/lib.rs similarity index 100% rename from evm/src/lib.rs rename to crates/evm/src/lib.rs diff --git a/evm/src/trace/decoder.rs b/crates/evm/src/trace/decoder.rs similarity index 100% rename from evm/src/trace/decoder.rs rename to crates/evm/src/trace/decoder.rs diff --git a/evm/src/trace/executor.rs b/crates/evm/src/trace/executor.rs similarity index 100% rename from evm/src/trace/executor.rs rename to crates/evm/src/trace/executor.rs diff --git a/evm/src/trace/identifier/etherscan.rs b/crates/evm/src/trace/identifier/etherscan.rs similarity index 100% rename from evm/src/trace/identifier/etherscan.rs rename to crates/evm/src/trace/identifier/etherscan.rs diff --git a/evm/src/trace/identifier/local.rs b/crates/evm/src/trace/identifier/local.rs similarity index 100% rename from evm/src/trace/identifier/local.rs rename to crates/evm/src/trace/identifier/local.rs diff --git a/evm/src/trace/identifier/mod.rs b/crates/evm/src/trace/identifier/mod.rs similarity index 100% rename from evm/src/trace/identifier/mod.rs rename to crates/evm/src/trace/identifier/mod.rs diff --git a/evm/src/trace/identifier/signatures.rs b/crates/evm/src/trace/identifier/signatures.rs similarity index 100% rename from evm/src/trace/identifier/signatures.rs rename to crates/evm/src/trace/identifier/signatures.rs diff --git a/evm/src/trace/mod.rs b/crates/evm/src/trace/mod.rs similarity index 100% rename from evm/src/trace/mod.rs rename to crates/evm/src/trace/mod.rs diff --git a/evm/src/trace/node.rs b/crates/evm/src/trace/node.rs similarity index 100% rename from evm/src/trace/node.rs rename to crates/evm/src/trace/node.rs diff --git a/evm/src/trace/utils.rs b/crates/evm/src/trace/utils.rs similarity index 100% rename from evm/src/trace/utils.rs rename to crates/evm/src/trace/utils.rs diff --git a/evm/src/utils.rs b/crates/evm/src/utils.rs similarity index 100% rename from evm/src/utils.rs rename to crates/evm/src/utils.rs diff --git a/evm/test-data/solc-obj.json b/crates/evm/test-data/solc-obj.json similarity index 100% rename from evm/test-data/solc-obj.json rename to crates/evm/test-data/solc-obj.json diff --git a/evm/test-data/storage.json b/crates/evm/test-data/storage.json similarity index 100% rename from evm/test-data/storage.json rename to crates/evm/test-data/storage.json diff --git a/fmt/Cargo.toml b/crates/fmt/Cargo.toml similarity index 100% rename from fmt/Cargo.toml rename to crates/fmt/Cargo.toml diff --git a/fmt/README.md b/crates/fmt/README.md similarity index 100% rename from fmt/README.md rename to crates/fmt/README.md diff --git a/fmt/src/buffer.rs b/crates/fmt/src/buffer.rs similarity index 100% rename from fmt/src/buffer.rs rename to crates/fmt/src/buffer.rs diff --git a/fmt/src/chunk.rs b/crates/fmt/src/chunk.rs similarity index 100% rename from fmt/src/chunk.rs rename to crates/fmt/src/chunk.rs diff --git a/fmt/src/comments.rs b/crates/fmt/src/comments.rs similarity index 100% rename from fmt/src/comments.rs rename to crates/fmt/src/comments.rs diff --git a/fmt/src/formatter.rs b/crates/fmt/src/formatter.rs similarity index 100% rename from fmt/src/formatter.rs rename to crates/fmt/src/formatter.rs diff --git a/fmt/src/helpers.rs b/crates/fmt/src/helpers.rs similarity index 100% rename from fmt/src/helpers.rs rename to crates/fmt/src/helpers.rs diff --git a/fmt/src/inline_config.rs b/crates/fmt/src/inline_config.rs similarity index 100% rename from fmt/src/inline_config.rs rename to crates/fmt/src/inline_config.rs diff --git a/fmt/src/lib.rs b/crates/fmt/src/lib.rs similarity index 100% rename from fmt/src/lib.rs rename to crates/fmt/src/lib.rs diff --git a/fmt/src/macros.rs b/crates/fmt/src/macros.rs similarity index 100% rename from fmt/src/macros.rs rename to crates/fmt/src/macros.rs diff --git a/fmt/src/solang_ext/ast_eq.rs b/crates/fmt/src/solang_ext/ast_eq.rs similarity index 100% rename from fmt/src/solang_ext/ast_eq.rs rename to crates/fmt/src/solang_ext/ast_eq.rs diff --git a/fmt/src/solang_ext/loc.rs b/crates/fmt/src/solang_ext/loc.rs similarity index 100% rename from fmt/src/solang_ext/loc.rs rename to crates/fmt/src/solang_ext/loc.rs diff --git a/fmt/src/solang_ext/mod.rs b/crates/fmt/src/solang_ext/mod.rs similarity index 100% rename from fmt/src/solang_ext/mod.rs rename to crates/fmt/src/solang_ext/mod.rs diff --git a/fmt/src/solang_ext/safe_unwrap.rs b/crates/fmt/src/solang_ext/safe_unwrap.rs similarity index 100% rename from fmt/src/solang_ext/safe_unwrap.rs rename to crates/fmt/src/solang_ext/safe_unwrap.rs diff --git a/fmt/src/string.rs b/crates/fmt/src/string.rs similarity index 100% rename from fmt/src/string.rs rename to crates/fmt/src/string.rs diff --git a/fmt/src/visit.rs b/crates/fmt/src/visit.rs similarity index 100% rename from fmt/src/visit.rs rename to crates/fmt/src/visit.rs diff --git a/fmt/testdata/Annotation/fmt.sol b/crates/fmt/testdata/Annotation/fmt.sol similarity index 100% rename from fmt/testdata/Annotation/fmt.sol rename to crates/fmt/testdata/Annotation/fmt.sol diff --git a/fmt/testdata/Annotation/original.sol b/crates/fmt/testdata/Annotation/original.sol similarity index 100% rename from fmt/testdata/Annotation/original.sol rename to crates/fmt/testdata/Annotation/original.sol diff --git a/fmt/testdata/ArrayExpressions/fmt.sol b/crates/fmt/testdata/ArrayExpressions/fmt.sol similarity index 100% rename from fmt/testdata/ArrayExpressions/fmt.sol rename to crates/fmt/testdata/ArrayExpressions/fmt.sol diff --git a/fmt/testdata/ArrayExpressions/original.sol b/crates/fmt/testdata/ArrayExpressions/original.sol similarity index 100% rename from fmt/testdata/ArrayExpressions/original.sol rename to crates/fmt/testdata/ArrayExpressions/original.sol diff --git a/fmt/testdata/ConditionalOperatorExpression/fmt.sol b/crates/fmt/testdata/ConditionalOperatorExpression/fmt.sol similarity index 100% rename from fmt/testdata/ConditionalOperatorExpression/fmt.sol rename to crates/fmt/testdata/ConditionalOperatorExpression/fmt.sol diff --git a/fmt/testdata/ConditionalOperatorExpression/original.sol b/crates/fmt/testdata/ConditionalOperatorExpression/original.sol similarity index 100% rename from fmt/testdata/ConditionalOperatorExpression/original.sol rename to crates/fmt/testdata/ConditionalOperatorExpression/original.sol diff --git a/fmt/testdata/ConstructorDefinition/fmt.sol b/crates/fmt/testdata/ConstructorDefinition/fmt.sol similarity index 100% rename from fmt/testdata/ConstructorDefinition/fmt.sol rename to crates/fmt/testdata/ConstructorDefinition/fmt.sol diff --git a/fmt/testdata/ConstructorDefinition/original.sol b/crates/fmt/testdata/ConstructorDefinition/original.sol similarity index 100% rename from fmt/testdata/ConstructorDefinition/original.sol rename to crates/fmt/testdata/ConstructorDefinition/original.sol diff --git a/fmt/testdata/ContractDefinition/bracket-spacing.fmt.sol b/crates/fmt/testdata/ContractDefinition/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/ContractDefinition/bracket-spacing.fmt.sol rename to crates/fmt/testdata/ContractDefinition/bracket-spacing.fmt.sol diff --git a/fmt/testdata/ContractDefinition/contract-new-lines.fmt.sol b/crates/fmt/testdata/ContractDefinition/contract-new-lines.fmt.sol similarity index 100% rename from fmt/testdata/ContractDefinition/contract-new-lines.fmt.sol rename to crates/fmt/testdata/ContractDefinition/contract-new-lines.fmt.sol diff --git a/fmt/testdata/ContractDefinition/fmt.sol b/crates/fmt/testdata/ContractDefinition/fmt.sol similarity index 100% rename from fmt/testdata/ContractDefinition/fmt.sol rename to crates/fmt/testdata/ContractDefinition/fmt.sol diff --git a/fmt/testdata/ContractDefinition/original.sol b/crates/fmt/testdata/ContractDefinition/original.sol similarity index 100% rename from fmt/testdata/ContractDefinition/original.sol rename to crates/fmt/testdata/ContractDefinition/original.sol diff --git a/fmt/testdata/DoWhileStatement/fmt.sol b/crates/fmt/testdata/DoWhileStatement/fmt.sol similarity index 100% rename from fmt/testdata/DoWhileStatement/fmt.sol rename to crates/fmt/testdata/DoWhileStatement/fmt.sol diff --git a/fmt/testdata/DoWhileStatement/original.sol b/crates/fmt/testdata/DoWhileStatement/original.sol similarity index 100% rename from fmt/testdata/DoWhileStatement/original.sol rename to crates/fmt/testdata/DoWhileStatement/original.sol diff --git a/fmt/testdata/DocComments/fmt.sol b/crates/fmt/testdata/DocComments/fmt.sol similarity index 100% rename from fmt/testdata/DocComments/fmt.sol rename to crates/fmt/testdata/DocComments/fmt.sol diff --git a/fmt/testdata/DocComments/original.sol b/crates/fmt/testdata/DocComments/original.sol similarity index 100% rename from fmt/testdata/DocComments/original.sol rename to crates/fmt/testdata/DocComments/original.sol diff --git a/fmt/testdata/DocComments/wrap-comments.fmt.sol b/crates/fmt/testdata/DocComments/wrap-comments.fmt.sol similarity index 100% rename from fmt/testdata/DocComments/wrap-comments.fmt.sol rename to crates/fmt/testdata/DocComments/wrap-comments.fmt.sol diff --git a/fmt/testdata/EmitStatement/fmt.sol b/crates/fmt/testdata/EmitStatement/fmt.sol similarity index 100% rename from fmt/testdata/EmitStatement/fmt.sol rename to crates/fmt/testdata/EmitStatement/fmt.sol diff --git a/fmt/testdata/EmitStatement/original.sol b/crates/fmt/testdata/EmitStatement/original.sol similarity index 100% rename from fmt/testdata/EmitStatement/original.sol rename to crates/fmt/testdata/EmitStatement/original.sol diff --git a/fmt/testdata/EnumDefinition/bracket-spacing.fmt.sol b/crates/fmt/testdata/EnumDefinition/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/EnumDefinition/bracket-spacing.fmt.sol rename to crates/fmt/testdata/EnumDefinition/bracket-spacing.fmt.sol diff --git a/fmt/testdata/EnumDefinition/fmt.sol b/crates/fmt/testdata/EnumDefinition/fmt.sol similarity index 100% rename from fmt/testdata/EnumDefinition/fmt.sol rename to crates/fmt/testdata/EnumDefinition/fmt.sol diff --git a/fmt/testdata/EnumDefinition/original.sol b/crates/fmt/testdata/EnumDefinition/original.sol similarity index 100% rename from fmt/testdata/EnumDefinition/original.sol rename to crates/fmt/testdata/EnumDefinition/original.sol diff --git a/fmt/testdata/ErrorDefinition/fmt.sol b/crates/fmt/testdata/ErrorDefinition/fmt.sol similarity index 100% rename from fmt/testdata/ErrorDefinition/fmt.sol rename to crates/fmt/testdata/ErrorDefinition/fmt.sol diff --git a/fmt/testdata/ErrorDefinition/original.sol b/crates/fmt/testdata/ErrorDefinition/original.sol similarity index 100% rename from fmt/testdata/ErrorDefinition/original.sol rename to crates/fmt/testdata/ErrorDefinition/original.sol diff --git a/fmt/testdata/EventDefinition/fmt.sol b/crates/fmt/testdata/EventDefinition/fmt.sol similarity index 100% rename from fmt/testdata/EventDefinition/fmt.sol rename to crates/fmt/testdata/EventDefinition/fmt.sol diff --git a/fmt/testdata/EventDefinition/original.sol b/crates/fmt/testdata/EventDefinition/original.sol similarity index 100% rename from fmt/testdata/EventDefinition/original.sol rename to crates/fmt/testdata/EventDefinition/original.sol diff --git a/fmt/testdata/ForStatement/fmt.sol b/crates/fmt/testdata/ForStatement/fmt.sol similarity index 100% rename from fmt/testdata/ForStatement/fmt.sol rename to crates/fmt/testdata/ForStatement/fmt.sol diff --git a/fmt/testdata/ForStatement/original.sol b/crates/fmt/testdata/ForStatement/original.sol similarity index 100% rename from fmt/testdata/ForStatement/original.sol rename to crates/fmt/testdata/ForStatement/original.sol diff --git a/fmt/testdata/FunctionCall/bracket-spacing.fmt.sol b/crates/fmt/testdata/FunctionCall/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/FunctionCall/bracket-spacing.fmt.sol rename to crates/fmt/testdata/FunctionCall/bracket-spacing.fmt.sol diff --git a/fmt/testdata/FunctionCall/fmt.sol b/crates/fmt/testdata/FunctionCall/fmt.sol similarity index 100% rename from fmt/testdata/FunctionCall/fmt.sol rename to crates/fmt/testdata/FunctionCall/fmt.sol diff --git a/fmt/testdata/FunctionCall/original.sol b/crates/fmt/testdata/FunctionCall/original.sol similarity index 100% rename from fmt/testdata/FunctionCall/original.sol rename to crates/fmt/testdata/FunctionCall/original.sol diff --git a/fmt/testdata/FunctionCallArgsStatement/bracket-spacing.fmt.sol b/crates/fmt/testdata/FunctionCallArgsStatement/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/FunctionCallArgsStatement/bracket-spacing.fmt.sol rename to crates/fmt/testdata/FunctionCallArgsStatement/bracket-spacing.fmt.sol diff --git a/fmt/testdata/FunctionCallArgsStatement/fmt.sol b/crates/fmt/testdata/FunctionCallArgsStatement/fmt.sol similarity index 100% rename from fmt/testdata/FunctionCallArgsStatement/fmt.sol rename to crates/fmt/testdata/FunctionCallArgsStatement/fmt.sol diff --git a/fmt/testdata/FunctionCallArgsStatement/original.sol b/crates/fmt/testdata/FunctionCallArgsStatement/original.sol similarity index 100% rename from fmt/testdata/FunctionCallArgsStatement/original.sol rename to crates/fmt/testdata/FunctionCallArgsStatement/original.sol diff --git a/fmt/testdata/FunctionDefinition/all.fmt.sol b/crates/fmt/testdata/FunctionDefinition/all.fmt.sol similarity index 100% rename from fmt/testdata/FunctionDefinition/all.fmt.sol rename to crates/fmt/testdata/FunctionDefinition/all.fmt.sol diff --git a/fmt/testdata/FunctionDefinition/fmt.sol b/crates/fmt/testdata/FunctionDefinition/fmt.sol similarity index 100% rename from fmt/testdata/FunctionDefinition/fmt.sol rename to crates/fmt/testdata/FunctionDefinition/fmt.sol diff --git a/fmt/testdata/FunctionDefinition/original.sol b/crates/fmt/testdata/FunctionDefinition/original.sol similarity index 100% rename from fmt/testdata/FunctionDefinition/original.sol rename to crates/fmt/testdata/FunctionDefinition/original.sol diff --git a/fmt/testdata/FunctionDefinition/override-spacing.fmt.sol b/crates/fmt/testdata/FunctionDefinition/override-spacing.fmt.sol similarity index 100% rename from fmt/testdata/FunctionDefinition/override-spacing.fmt.sol rename to crates/fmt/testdata/FunctionDefinition/override-spacing.fmt.sol diff --git a/fmt/testdata/FunctionDefinition/params-first.fmt.sol b/crates/fmt/testdata/FunctionDefinition/params-first.fmt.sol similarity index 100% rename from fmt/testdata/FunctionDefinition/params-first.fmt.sol rename to crates/fmt/testdata/FunctionDefinition/params-first.fmt.sol diff --git a/fmt/testdata/FunctionType/fmt.sol b/crates/fmt/testdata/FunctionType/fmt.sol similarity index 100% rename from fmt/testdata/FunctionType/fmt.sol rename to crates/fmt/testdata/FunctionType/fmt.sol diff --git a/fmt/testdata/FunctionType/original.sol b/crates/fmt/testdata/FunctionType/original.sol similarity index 100% rename from fmt/testdata/FunctionType/original.sol rename to crates/fmt/testdata/FunctionType/original.sol diff --git a/fmt/testdata/IfStatement/block-multi.fmt.sol b/crates/fmt/testdata/IfStatement/block-multi.fmt.sol similarity index 100% rename from fmt/testdata/IfStatement/block-multi.fmt.sol rename to crates/fmt/testdata/IfStatement/block-multi.fmt.sol diff --git a/fmt/testdata/IfStatement/block-single.fmt.sol b/crates/fmt/testdata/IfStatement/block-single.fmt.sol similarity index 100% rename from fmt/testdata/IfStatement/block-single.fmt.sol rename to crates/fmt/testdata/IfStatement/block-single.fmt.sol diff --git a/fmt/testdata/IfStatement/fmt.sol b/crates/fmt/testdata/IfStatement/fmt.sol similarity index 100% rename from fmt/testdata/IfStatement/fmt.sol rename to crates/fmt/testdata/IfStatement/fmt.sol diff --git a/fmt/testdata/IfStatement/original.sol b/crates/fmt/testdata/IfStatement/original.sol similarity index 100% rename from fmt/testdata/IfStatement/original.sol rename to crates/fmt/testdata/IfStatement/original.sol diff --git a/fmt/testdata/IfStatement2/fmt.sol b/crates/fmt/testdata/IfStatement2/fmt.sol similarity index 100% rename from fmt/testdata/IfStatement2/fmt.sol rename to crates/fmt/testdata/IfStatement2/fmt.sol diff --git a/fmt/testdata/IfStatement2/original.sol b/crates/fmt/testdata/IfStatement2/original.sol similarity index 100% rename from fmt/testdata/IfStatement2/original.sol rename to crates/fmt/testdata/IfStatement2/original.sol diff --git a/fmt/testdata/ImportDirective/bracket-spacing.fmt.sol b/crates/fmt/testdata/ImportDirective/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/ImportDirective/bracket-spacing.fmt.sol rename to crates/fmt/testdata/ImportDirective/bracket-spacing.fmt.sol diff --git a/fmt/testdata/ImportDirective/fmt.sol b/crates/fmt/testdata/ImportDirective/fmt.sol similarity index 100% rename from fmt/testdata/ImportDirective/fmt.sol rename to crates/fmt/testdata/ImportDirective/fmt.sol diff --git a/fmt/testdata/ImportDirective/original.sol b/crates/fmt/testdata/ImportDirective/original.sol similarity index 100% rename from fmt/testdata/ImportDirective/original.sol rename to crates/fmt/testdata/ImportDirective/original.sol diff --git a/fmt/testdata/ImportDirective/preserve-quote.fmt.sol b/crates/fmt/testdata/ImportDirective/preserve-quote.fmt.sol similarity index 100% rename from fmt/testdata/ImportDirective/preserve-quote.fmt.sol rename to crates/fmt/testdata/ImportDirective/preserve-quote.fmt.sol diff --git a/fmt/testdata/ImportDirective/single-quote.fmt.sol b/crates/fmt/testdata/ImportDirective/single-quote.fmt.sol similarity index 100% rename from fmt/testdata/ImportDirective/single-quote.fmt.sol rename to crates/fmt/testdata/ImportDirective/single-quote.fmt.sol diff --git a/fmt/testdata/InlineDisable/fmt.sol b/crates/fmt/testdata/InlineDisable/fmt.sol similarity index 100% rename from fmt/testdata/InlineDisable/fmt.sol rename to crates/fmt/testdata/InlineDisable/fmt.sol diff --git a/fmt/testdata/InlineDisable/original.sol b/crates/fmt/testdata/InlineDisable/original.sol similarity index 100% rename from fmt/testdata/InlineDisable/original.sol rename to crates/fmt/testdata/InlineDisable/original.sol diff --git a/fmt/testdata/IntTypes/fmt.sol b/crates/fmt/testdata/IntTypes/fmt.sol similarity index 100% rename from fmt/testdata/IntTypes/fmt.sol rename to crates/fmt/testdata/IntTypes/fmt.sol diff --git a/fmt/testdata/IntTypes/original.sol b/crates/fmt/testdata/IntTypes/original.sol similarity index 100% rename from fmt/testdata/IntTypes/original.sol rename to crates/fmt/testdata/IntTypes/original.sol diff --git a/fmt/testdata/IntTypes/preserve.fmt.sol b/crates/fmt/testdata/IntTypes/preserve.fmt.sol similarity index 100% rename from fmt/testdata/IntTypes/preserve.fmt.sol rename to crates/fmt/testdata/IntTypes/preserve.fmt.sol diff --git a/fmt/testdata/IntTypes/short.fmt.sol b/crates/fmt/testdata/IntTypes/short.fmt.sol similarity index 100% rename from fmt/testdata/IntTypes/short.fmt.sol rename to crates/fmt/testdata/IntTypes/short.fmt.sol diff --git a/fmt/testdata/LiteralExpression/fmt.sol b/crates/fmt/testdata/LiteralExpression/fmt.sol similarity index 100% rename from fmt/testdata/LiteralExpression/fmt.sol rename to crates/fmt/testdata/LiteralExpression/fmt.sol diff --git a/fmt/testdata/LiteralExpression/original.sol b/crates/fmt/testdata/LiteralExpression/original.sol similarity index 100% rename from fmt/testdata/LiteralExpression/original.sol rename to crates/fmt/testdata/LiteralExpression/original.sol diff --git a/fmt/testdata/LiteralExpression/preserve-quote.fmt.sol b/crates/fmt/testdata/LiteralExpression/preserve-quote.fmt.sol similarity index 100% rename from fmt/testdata/LiteralExpression/preserve-quote.fmt.sol rename to crates/fmt/testdata/LiteralExpression/preserve-quote.fmt.sol diff --git a/fmt/testdata/LiteralExpression/single-quote.fmt.sol b/crates/fmt/testdata/LiteralExpression/single-quote.fmt.sol similarity index 100% rename from fmt/testdata/LiteralExpression/single-quote.fmt.sol rename to crates/fmt/testdata/LiteralExpression/single-quote.fmt.sol diff --git a/fmt/testdata/MappingType/fmt.sol b/crates/fmt/testdata/MappingType/fmt.sol similarity index 100% rename from fmt/testdata/MappingType/fmt.sol rename to crates/fmt/testdata/MappingType/fmt.sol diff --git a/fmt/testdata/MappingType/original.sol b/crates/fmt/testdata/MappingType/original.sol similarity index 100% rename from fmt/testdata/MappingType/original.sol rename to crates/fmt/testdata/MappingType/original.sol diff --git a/fmt/testdata/ModifierDefinition/fmt.sol b/crates/fmt/testdata/ModifierDefinition/fmt.sol similarity index 100% rename from fmt/testdata/ModifierDefinition/fmt.sol rename to crates/fmt/testdata/ModifierDefinition/fmt.sol diff --git a/fmt/testdata/ModifierDefinition/original.sol b/crates/fmt/testdata/ModifierDefinition/original.sol similarity index 100% rename from fmt/testdata/ModifierDefinition/original.sol rename to crates/fmt/testdata/ModifierDefinition/original.sol diff --git a/fmt/testdata/ModifierDefinition/override-spacing.fmt.sol b/crates/fmt/testdata/ModifierDefinition/override-spacing.fmt.sol similarity index 100% rename from fmt/testdata/ModifierDefinition/override-spacing.fmt.sol rename to crates/fmt/testdata/ModifierDefinition/override-spacing.fmt.sol diff --git a/fmt/testdata/NamedFunctionCallExpression/fmt.sol b/crates/fmt/testdata/NamedFunctionCallExpression/fmt.sol similarity index 100% rename from fmt/testdata/NamedFunctionCallExpression/fmt.sol rename to crates/fmt/testdata/NamedFunctionCallExpression/fmt.sol diff --git a/fmt/testdata/NamedFunctionCallExpression/original.sol b/crates/fmt/testdata/NamedFunctionCallExpression/original.sol similarity index 100% rename from fmt/testdata/NamedFunctionCallExpression/original.sol rename to crates/fmt/testdata/NamedFunctionCallExpression/original.sol diff --git a/fmt/testdata/NumberLiteralUnderscore/fmt.sol b/crates/fmt/testdata/NumberLiteralUnderscore/fmt.sol similarity index 100% rename from fmt/testdata/NumberLiteralUnderscore/fmt.sol rename to crates/fmt/testdata/NumberLiteralUnderscore/fmt.sol diff --git a/fmt/testdata/NumberLiteralUnderscore/original.sol b/crates/fmt/testdata/NumberLiteralUnderscore/original.sol similarity index 100% rename from fmt/testdata/NumberLiteralUnderscore/original.sol rename to crates/fmt/testdata/NumberLiteralUnderscore/original.sol diff --git a/fmt/testdata/NumberLiteralUnderscore/remove.fmt.sol b/crates/fmt/testdata/NumberLiteralUnderscore/remove.fmt.sol similarity index 100% rename from fmt/testdata/NumberLiteralUnderscore/remove.fmt.sol rename to crates/fmt/testdata/NumberLiteralUnderscore/remove.fmt.sol diff --git a/fmt/testdata/NumberLiteralUnderscore/thousands.fmt.sol b/crates/fmt/testdata/NumberLiteralUnderscore/thousands.fmt.sol similarity index 100% rename from fmt/testdata/NumberLiteralUnderscore/thousands.fmt.sol rename to crates/fmt/testdata/NumberLiteralUnderscore/thousands.fmt.sol diff --git a/fmt/testdata/OperatorExpressions/fmt.sol b/crates/fmt/testdata/OperatorExpressions/fmt.sol similarity index 100% rename from fmt/testdata/OperatorExpressions/fmt.sol rename to crates/fmt/testdata/OperatorExpressions/fmt.sol diff --git a/fmt/testdata/OperatorExpressions/original.sol b/crates/fmt/testdata/OperatorExpressions/original.sol similarity index 100% rename from fmt/testdata/OperatorExpressions/original.sol rename to crates/fmt/testdata/OperatorExpressions/original.sol diff --git a/fmt/testdata/PragmaDirective/fmt.sol b/crates/fmt/testdata/PragmaDirective/fmt.sol similarity index 100% rename from fmt/testdata/PragmaDirective/fmt.sol rename to crates/fmt/testdata/PragmaDirective/fmt.sol diff --git a/fmt/testdata/PragmaDirective/original.sol b/crates/fmt/testdata/PragmaDirective/original.sol similarity index 100% rename from fmt/testdata/PragmaDirective/original.sol rename to crates/fmt/testdata/PragmaDirective/original.sol diff --git a/fmt/testdata/Repros/fmt.sol b/crates/fmt/testdata/Repros/fmt.sol similarity index 100% rename from fmt/testdata/Repros/fmt.sol rename to crates/fmt/testdata/Repros/fmt.sol diff --git a/fmt/testdata/Repros/original.sol b/crates/fmt/testdata/Repros/original.sol similarity index 100% rename from fmt/testdata/Repros/original.sol rename to crates/fmt/testdata/Repros/original.sol diff --git a/fmt/testdata/ReturnStatement/fmt.sol b/crates/fmt/testdata/ReturnStatement/fmt.sol similarity index 100% rename from fmt/testdata/ReturnStatement/fmt.sol rename to crates/fmt/testdata/ReturnStatement/fmt.sol diff --git a/fmt/testdata/ReturnStatement/original.sol b/crates/fmt/testdata/ReturnStatement/original.sol similarity index 100% rename from fmt/testdata/ReturnStatement/original.sol rename to crates/fmt/testdata/ReturnStatement/original.sol diff --git a/fmt/testdata/RevertNamedArgsStatement/fmt.sol b/crates/fmt/testdata/RevertNamedArgsStatement/fmt.sol similarity index 100% rename from fmt/testdata/RevertNamedArgsStatement/fmt.sol rename to crates/fmt/testdata/RevertNamedArgsStatement/fmt.sol diff --git a/fmt/testdata/RevertNamedArgsStatement/original.sol b/crates/fmt/testdata/RevertNamedArgsStatement/original.sol similarity index 100% rename from fmt/testdata/RevertNamedArgsStatement/original.sol rename to crates/fmt/testdata/RevertNamedArgsStatement/original.sol diff --git a/fmt/testdata/RevertStatement/fmt.sol b/crates/fmt/testdata/RevertStatement/fmt.sol similarity index 100% rename from fmt/testdata/RevertStatement/fmt.sol rename to crates/fmt/testdata/RevertStatement/fmt.sol diff --git a/fmt/testdata/RevertStatement/original.sol b/crates/fmt/testdata/RevertStatement/original.sol similarity index 100% rename from fmt/testdata/RevertStatement/original.sol rename to crates/fmt/testdata/RevertStatement/original.sol diff --git a/fmt/testdata/SimpleComments/fmt.sol b/crates/fmt/testdata/SimpleComments/fmt.sol similarity index 100% rename from fmt/testdata/SimpleComments/fmt.sol rename to crates/fmt/testdata/SimpleComments/fmt.sol diff --git a/fmt/testdata/SimpleComments/original.sol b/crates/fmt/testdata/SimpleComments/original.sol similarity index 100% rename from fmt/testdata/SimpleComments/original.sol rename to crates/fmt/testdata/SimpleComments/original.sol diff --git a/fmt/testdata/SimpleComments/wrap-comments.fmt.sol b/crates/fmt/testdata/SimpleComments/wrap-comments.fmt.sol similarity index 100% rename from fmt/testdata/SimpleComments/wrap-comments.fmt.sol rename to crates/fmt/testdata/SimpleComments/wrap-comments.fmt.sol diff --git a/fmt/testdata/StatementBlock/bracket-spacing.fmt.sol b/crates/fmt/testdata/StatementBlock/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/StatementBlock/bracket-spacing.fmt.sol rename to crates/fmt/testdata/StatementBlock/bracket-spacing.fmt.sol diff --git a/fmt/testdata/StatementBlock/fmt.sol b/crates/fmt/testdata/StatementBlock/fmt.sol similarity index 100% rename from fmt/testdata/StatementBlock/fmt.sol rename to crates/fmt/testdata/StatementBlock/fmt.sol diff --git a/fmt/testdata/StatementBlock/original.sol b/crates/fmt/testdata/StatementBlock/original.sol similarity index 100% rename from fmt/testdata/StatementBlock/original.sol rename to crates/fmt/testdata/StatementBlock/original.sol diff --git a/fmt/testdata/StructDefinition/bracket-spacing.fmt.sol b/crates/fmt/testdata/StructDefinition/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/StructDefinition/bracket-spacing.fmt.sol rename to crates/fmt/testdata/StructDefinition/bracket-spacing.fmt.sol diff --git a/fmt/testdata/StructDefinition/fmt.sol b/crates/fmt/testdata/StructDefinition/fmt.sol similarity index 100% rename from fmt/testdata/StructDefinition/fmt.sol rename to crates/fmt/testdata/StructDefinition/fmt.sol diff --git a/fmt/testdata/StructDefinition/original.sol b/crates/fmt/testdata/StructDefinition/original.sol similarity index 100% rename from fmt/testdata/StructDefinition/original.sol rename to crates/fmt/testdata/StructDefinition/original.sol diff --git a/fmt/testdata/ThisExpression/fmt.sol b/crates/fmt/testdata/ThisExpression/fmt.sol similarity index 100% rename from fmt/testdata/ThisExpression/fmt.sol rename to crates/fmt/testdata/ThisExpression/fmt.sol diff --git a/fmt/testdata/ThisExpression/original.sol b/crates/fmt/testdata/ThisExpression/original.sol similarity index 100% rename from fmt/testdata/ThisExpression/original.sol rename to crates/fmt/testdata/ThisExpression/original.sol diff --git a/fmt/testdata/TrailingComma/fmt.sol b/crates/fmt/testdata/TrailingComma/fmt.sol similarity index 100% rename from fmt/testdata/TrailingComma/fmt.sol rename to crates/fmt/testdata/TrailingComma/fmt.sol diff --git a/fmt/testdata/TrailingComma/original.sol b/crates/fmt/testdata/TrailingComma/original.sol similarity index 100% rename from fmt/testdata/TrailingComma/original.sol rename to crates/fmt/testdata/TrailingComma/original.sol diff --git a/fmt/testdata/TryStatement/fmt.sol b/crates/fmt/testdata/TryStatement/fmt.sol similarity index 100% rename from fmt/testdata/TryStatement/fmt.sol rename to crates/fmt/testdata/TryStatement/fmt.sol diff --git a/fmt/testdata/TryStatement/original.sol b/crates/fmt/testdata/TryStatement/original.sol similarity index 100% rename from fmt/testdata/TryStatement/original.sol rename to crates/fmt/testdata/TryStatement/original.sol diff --git a/fmt/testdata/TypeDefinition/fmt.sol b/crates/fmt/testdata/TypeDefinition/fmt.sol similarity index 100% rename from fmt/testdata/TypeDefinition/fmt.sol rename to crates/fmt/testdata/TypeDefinition/fmt.sol diff --git a/fmt/testdata/TypeDefinition/original.sol b/crates/fmt/testdata/TypeDefinition/original.sol similarity index 100% rename from fmt/testdata/TypeDefinition/original.sol rename to crates/fmt/testdata/TypeDefinition/original.sol diff --git a/fmt/testdata/UnitExpression/fmt.sol b/crates/fmt/testdata/UnitExpression/fmt.sol similarity index 100% rename from fmt/testdata/UnitExpression/fmt.sol rename to crates/fmt/testdata/UnitExpression/fmt.sol diff --git a/fmt/testdata/UnitExpression/original.sol b/crates/fmt/testdata/UnitExpression/original.sol similarity index 100% rename from fmt/testdata/UnitExpression/original.sol rename to crates/fmt/testdata/UnitExpression/original.sol diff --git a/fmt/testdata/UsingDirective/fmt.sol b/crates/fmt/testdata/UsingDirective/fmt.sol similarity index 100% rename from fmt/testdata/UsingDirective/fmt.sol rename to crates/fmt/testdata/UsingDirective/fmt.sol diff --git a/fmt/testdata/UsingDirective/original.sol b/crates/fmt/testdata/UsingDirective/original.sol similarity index 100% rename from fmt/testdata/UsingDirective/original.sol rename to crates/fmt/testdata/UsingDirective/original.sol diff --git a/fmt/testdata/VariableAssignment/bracket-spacing.fmt.sol b/crates/fmt/testdata/VariableAssignment/bracket-spacing.fmt.sol similarity index 100% rename from fmt/testdata/VariableAssignment/bracket-spacing.fmt.sol rename to crates/fmt/testdata/VariableAssignment/bracket-spacing.fmt.sol diff --git a/fmt/testdata/VariableAssignment/fmt.sol b/crates/fmt/testdata/VariableAssignment/fmt.sol similarity index 100% rename from fmt/testdata/VariableAssignment/fmt.sol rename to crates/fmt/testdata/VariableAssignment/fmt.sol diff --git a/fmt/testdata/VariableAssignment/original.sol b/crates/fmt/testdata/VariableAssignment/original.sol similarity index 100% rename from fmt/testdata/VariableAssignment/original.sol rename to crates/fmt/testdata/VariableAssignment/original.sol diff --git a/fmt/testdata/VariableDefinition/fmt.sol b/crates/fmt/testdata/VariableDefinition/fmt.sol similarity index 100% rename from fmt/testdata/VariableDefinition/fmt.sol rename to crates/fmt/testdata/VariableDefinition/fmt.sol diff --git a/fmt/testdata/VariableDefinition/original.sol b/crates/fmt/testdata/VariableDefinition/original.sol similarity index 100% rename from fmt/testdata/VariableDefinition/original.sol rename to crates/fmt/testdata/VariableDefinition/original.sol diff --git a/fmt/testdata/VariableDefinition/override-spacing.fmt.sol b/crates/fmt/testdata/VariableDefinition/override-spacing.fmt.sol similarity index 100% rename from fmt/testdata/VariableDefinition/override-spacing.fmt.sol rename to crates/fmt/testdata/VariableDefinition/override-spacing.fmt.sol diff --git a/fmt/testdata/WhileStatement/block-multi.fmt.sol b/crates/fmt/testdata/WhileStatement/block-multi.fmt.sol similarity index 100% rename from fmt/testdata/WhileStatement/block-multi.fmt.sol rename to crates/fmt/testdata/WhileStatement/block-multi.fmt.sol diff --git a/fmt/testdata/WhileStatement/block-single.fmt.sol b/crates/fmt/testdata/WhileStatement/block-single.fmt.sol similarity index 100% rename from fmt/testdata/WhileStatement/block-single.fmt.sol rename to crates/fmt/testdata/WhileStatement/block-single.fmt.sol diff --git a/fmt/testdata/WhileStatement/fmt.sol b/crates/fmt/testdata/WhileStatement/fmt.sol similarity index 100% rename from fmt/testdata/WhileStatement/fmt.sol rename to crates/fmt/testdata/WhileStatement/fmt.sol diff --git a/fmt/testdata/WhileStatement/original.sol b/crates/fmt/testdata/WhileStatement/original.sol similarity index 100% rename from fmt/testdata/WhileStatement/original.sol rename to crates/fmt/testdata/WhileStatement/original.sol diff --git a/fmt/testdata/Yul/fmt.sol b/crates/fmt/testdata/Yul/fmt.sol similarity index 100% rename from fmt/testdata/Yul/fmt.sol rename to crates/fmt/testdata/Yul/fmt.sol diff --git a/fmt/testdata/Yul/original.sol b/crates/fmt/testdata/Yul/original.sol similarity index 100% rename from fmt/testdata/Yul/original.sol rename to crates/fmt/testdata/Yul/original.sol diff --git a/fmt/testdata/YulStrings/fmt.sol b/crates/fmt/testdata/YulStrings/fmt.sol similarity index 100% rename from fmt/testdata/YulStrings/fmt.sol rename to crates/fmt/testdata/YulStrings/fmt.sol diff --git a/fmt/testdata/YulStrings/original.sol b/crates/fmt/testdata/YulStrings/original.sol similarity index 100% rename from fmt/testdata/YulStrings/original.sol rename to crates/fmt/testdata/YulStrings/original.sol diff --git a/fmt/testdata/YulStrings/preserve-quote.fmt.sol b/crates/fmt/testdata/YulStrings/preserve-quote.fmt.sol similarity index 100% rename from fmt/testdata/YulStrings/preserve-quote.fmt.sol rename to crates/fmt/testdata/YulStrings/preserve-quote.fmt.sol diff --git a/fmt/testdata/YulStrings/single-quote.fmt.sol b/crates/fmt/testdata/YulStrings/single-quote.fmt.sol similarity index 100% rename from fmt/testdata/YulStrings/single-quote.fmt.sol rename to crates/fmt/testdata/YulStrings/single-quote.fmt.sol diff --git a/fmt/tests/it/formatter.rs b/crates/fmt/tests/it/formatter.rs similarity index 100% rename from fmt/tests/it/formatter.rs rename to crates/fmt/tests/it/formatter.rs diff --git a/fmt/tests/it/main.rs b/crates/fmt/tests/it/main.rs similarity index 100% rename from fmt/tests/it/main.rs rename to crates/fmt/tests/it/main.rs diff --git a/forge/Cargo.toml b/crates/forge/Cargo.toml similarity index 100% rename from forge/Cargo.toml rename to crates/forge/Cargo.toml diff --git a/forge/README.md b/crates/forge/README.md similarity index 100% rename from forge/README.md rename to crates/forge/README.md diff --git a/forge/src/coverage.rs b/crates/forge/src/coverage.rs similarity index 100% rename from forge/src/coverage.rs rename to crates/forge/src/coverage.rs diff --git a/forge/src/gas_report.rs b/crates/forge/src/gas_report.rs similarity index 100% rename from forge/src/gas_report.rs rename to crates/forge/src/gas_report.rs diff --git a/forge/src/lib.rs b/crates/forge/src/lib.rs similarity index 100% rename from forge/src/lib.rs rename to crates/forge/src/lib.rs diff --git a/forge/src/multi_runner.rs b/crates/forge/src/multi_runner.rs similarity index 100% rename from forge/src/multi_runner.rs rename to crates/forge/src/multi_runner.rs diff --git a/forge/src/result.rs b/crates/forge/src/result.rs similarity index 100% rename from forge/src/result.rs rename to crates/forge/src/result.rs diff --git a/forge/src/runner.rs b/crates/forge/src/runner.rs similarity index 100% rename from forge/src/runner.rs rename to crates/forge/src/runner.rs diff --git a/forge/tests/it/cheats.rs b/crates/forge/tests/it/cheats.rs similarity index 100% rename from forge/tests/it/cheats.rs rename to crates/forge/tests/it/cheats.rs diff --git a/forge/tests/it/config.rs b/crates/forge/tests/it/config.rs similarity index 100% rename from forge/tests/it/config.rs rename to crates/forge/tests/it/config.rs diff --git a/forge/tests/it/core.rs b/crates/forge/tests/it/core.rs similarity index 100% rename from forge/tests/it/core.rs rename to crates/forge/tests/it/core.rs diff --git a/forge/tests/it/fork.rs b/crates/forge/tests/it/fork.rs similarity index 100% rename from forge/tests/it/fork.rs rename to crates/forge/tests/it/fork.rs diff --git a/forge/tests/it/fs.rs b/crates/forge/tests/it/fs.rs similarity index 100% rename from forge/tests/it/fs.rs rename to crates/forge/tests/it/fs.rs diff --git a/forge/tests/it/fuzz.rs b/crates/forge/tests/it/fuzz.rs similarity index 100% rename from forge/tests/it/fuzz.rs rename to crates/forge/tests/it/fuzz.rs diff --git a/crates/forge/tests/it/inline.rs b/crates/forge/tests/it/inline.rs new file mode 100644 index 0000000000000..4f76391373a76 --- /dev/null +++ b/crates/forge/tests/it/inline.rs @@ -0,0 +1,110 @@ +use crate::{ + config::runner, + test_helpers::{filter::Filter, COMPILED, PROJECT}, +}; +use forge::{ + result::{SuiteResult, TestKind, TestResult}, + TestOptions, TestOptionsBuilder, +}; +use foundry_config::{FuzzConfig, InvariantConfig}; + +#[tokio::test(flavor = "multi_thread")] +async fn inline_config_run_fuzz() { + let opts = test_options(); + + let filter = Filter::new(".*", ".*", ".*inline/FuzzInlineConf.t.sol"); + + let mut runner = runner().await; + runner.test_options = opts.clone(); + + let result = runner.test(&filter, None, opts).await; + let suite_result: &SuiteResult = + result.get("inline/FuzzInlineConf.t.sol:FuzzInlineConf").unwrap(); + let test_result: &TestResult = + suite_result.test_results.get("testInlineConfFuzz(uint8)").unwrap(); + match &test_result.kind { + TestKind::Fuzz { runs, .. } => { + assert_eq!(runs, &1024); + } + _ => { + unreachable!() + } + } +} + +#[tokio::test(flavor = "multi_thread")] +async fn inline_config_run_invariant() { + const ROOT: &str = "inline/InvariantInlineConf.t.sol"; + + let opts = test_options(); + let filter = Filter::new(".*", ".*", ".*inline/InvariantInlineConf.t.sol"); + let mut runner = runner().await; + runner.test_options = opts.clone(); + + let result = runner.test(&filter, None, opts).await; + + let suite_result_1 = result.get(&format!("{ROOT}:InvariantInlineConf")).expect("Result exists"); + let suite_result_2 = + result.get(&format!("{ROOT}:InvariantInlineConf2")).expect("Result exists"); + + let test_result_1 = suite_result_1.test_results.get("invariant_neverFalse()").unwrap(); + let test_result_2 = suite_result_2.test_results.get("invariant_neverFalse()").unwrap(); + + match &test_result_1.kind { + TestKind::Invariant { runs, .. } => { + assert_eq!(runs, &333); + } + _ => { + unreachable!() + } + } + + match &test_result_2.kind { + TestKind::Invariant { runs, .. } => { + assert_eq!(runs, &42); + } + _ => { + unreachable!() + } + } +} + +#[test] +fn build_test_options() { + let root = &PROJECT.paths.root; + let profiles = vec!["default".to_string(), "ci".to_string()]; + let build_result = TestOptionsBuilder::default() + .fuzz(FuzzConfig::default()) + .invariant(InvariantConfig::default()) + .compile_output(&COMPILED) + .profiles(profiles) + .build(root); + + assert!(build_result.is_ok()); +} + +#[test] +fn build_test_options_just_one_valid_profile() { + let root = &PROJECT.paths.root; + let valid_profiles = vec!["profile-sheldon-cooper".to_string()]; + let build_result = TestOptionsBuilder::default() + .fuzz(FuzzConfig::default()) + .invariant(InvariantConfig::default()) + .compile_output(&COMPILED) + .profiles(valid_profiles) + .build(root); + + // We expect an error, since COMPILED contains in-line + // per-test configs for "default" and "ci" profiles + assert!(build_result.is_err()); +} + +fn test_options() -> TestOptions { + let root = &PROJECT.paths.root; + TestOptionsBuilder::default() + .fuzz(FuzzConfig::default()) + .invariant(InvariantConfig::default()) + .compile_output(&COMPILED) + .build(root) + .expect("Config loaded") +} diff --git a/forge/tests/it/invariant.rs b/crates/forge/tests/it/invariant.rs similarity index 100% rename from forge/tests/it/invariant.rs rename to crates/forge/tests/it/invariant.rs diff --git a/forge/tests/it/main.rs b/crates/forge/tests/it/main.rs similarity index 100% rename from forge/tests/it/main.rs rename to crates/forge/tests/it/main.rs diff --git a/forge/tests/it/repros.rs b/crates/forge/tests/it/repros.rs similarity index 100% rename from forge/tests/it/repros.rs rename to crates/forge/tests/it/repros.rs diff --git a/forge/tests/it/spec.rs b/crates/forge/tests/it/spec.rs similarity index 100% rename from forge/tests/it/spec.rs rename to crates/forge/tests/it/spec.rs diff --git a/forge/tests/it/test_helpers.rs b/crates/forge/tests/it/test_helpers.rs similarity index 99% rename from forge/tests/it/test_helpers.rs rename to crates/forge/tests/it/test_helpers.rs index 3cf63af33c61c..b28a3cca0c958 100644 --- a/forge/tests/it/test_helpers.rs +++ b/crates/forge/tests/it/test_helpers.rs @@ -19,13 +19,13 @@ use foundry_evm::{ use std::{path::PathBuf, str::FromStr}; pub static PROJECT: Lazy = Lazy::new(|| { - let root = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../testdata"); + let root = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../testdata"); let paths = ProjectPathsConfig::builder().root(root.clone()).sources(root).build().unwrap(); Project::builder().paths(paths).ephemeral().no_artifacts().build().unwrap() }); pub static LIBS_PROJECT: Lazy = Lazy::new(|| { - let root = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../testdata"); + let root = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../testdata"); let paths = ProjectPathsConfig::builder().root(root.clone()).sources(root).build().unwrap(); let libs = ["fork/Fork.t.sol:DssExecLib:0xfD88CeE74f7D78697775aBDAE53f9Da1559728E4".to_string()]; diff --git a/macros/Cargo.toml b/crates/macros/Cargo.toml similarity index 100% rename from macros/Cargo.toml rename to crates/macros/Cargo.toml diff --git a/macros/impl/Cargo.toml b/crates/macros/impl/Cargo.toml similarity index 100% rename from macros/impl/Cargo.toml rename to crates/macros/impl/Cargo.toml diff --git a/macros/impl/src/console_fmt.rs b/crates/macros/impl/src/console_fmt.rs similarity index 100% rename from macros/impl/src/console_fmt.rs rename to crates/macros/impl/src/console_fmt.rs diff --git a/macros/impl/src/lib.rs b/crates/macros/impl/src/lib.rs similarity index 100% rename from macros/impl/src/lib.rs rename to crates/macros/impl/src/lib.rs diff --git a/macros/impl/src/utils.rs b/crates/macros/impl/src/utils.rs similarity index 100% rename from macros/impl/src/utils.rs rename to crates/macros/impl/src/utils.rs diff --git a/macros/src/fmt/console_fmt.rs b/crates/macros/src/fmt/console_fmt.rs similarity index 100% rename from macros/src/fmt/console_fmt.rs rename to crates/macros/src/fmt/console_fmt.rs diff --git a/macros/src/fmt/mod.rs b/crates/macros/src/fmt/mod.rs similarity index 100% rename from macros/src/fmt/mod.rs rename to crates/macros/src/fmt/mod.rs diff --git a/macros/src/fmt/token.rs b/crates/macros/src/fmt/token.rs similarity index 100% rename from macros/src/fmt/token.rs rename to crates/macros/src/fmt/token.rs diff --git a/macros/src/fmt/ui.rs b/crates/macros/src/fmt/ui.rs similarity index 100% rename from macros/src/fmt/ui.rs rename to crates/macros/src/fmt/ui.rs diff --git a/macros/src/lib.rs b/crates/macros/src/lib.rs similarity index 100% rename from macros/src/lib.rs rename to crates/macros/src/lib.rs diff --git a/ui/Cargo.toml b/crates/ui/Cargo.toml similarity index 100% rename from ui/Cargo.toml rename to crates/ui/Cargo.toml diff --git a/ui/src/lib.rs b/crates/ui/src/lib.rs similarity index 100% rename from ui/src/lib.rs rename to crates/ui/src/lib.rs diff --git a/ui/src/op_effects.rs b/crates/ui/src/op_effects.rs similarity index 100% rename from ui/src/op_effects.rs rename to crates/ui/src/op_effects.rs diff --git a/utils/Cargo.toml b/crates/utils/Cargo.toml similarity index 100% rename from utils/Cargo.toml rename to crates/utils/Cargo.toml diff --git a/utils/README.md b/crates/utils/README.md similarity index 100% rename from utils/README.md rename to crates/utils/README.md diff --git a/utils/src/abi.rs b/crates/utils/src/abi.rs similarity index 92% rename from utils/src/abi.rs rename to crates/utils/src/abi.rs index 974a80d6d5cc6..2901181ab1721 100644 --- a/utils/src/abi.rs +++ b/crates/utils/src/abi.rs @@ -339,16 +339,18 @@ mod tests { #[cfg(any(target_os = "linux", target_os = "macos"))] fn abi2solidity() { let contract_abi: RawAbi = serde_json::from_str(include_str!( - "../../testdata/fixtures/SolidityGeneration/InterfaceABI.json" + "../../../testdata/fixtures/SolidityGeneration/InterfaceABI.json" )) .unwrap(); pretty_assertions::assert_eq!( - include_str!("../../testdata/fixtures/SolidityGeneration/GeneratedNamedInterface.sol"), + include_str!( + "../../../testdata/fixtures/SolidityGeneration/GeneratedNamedInterface.sol" + ), abi_to_solidity(&contract_abi, "test").unwrap() ); pretty_assertions::assert_eq!( include_str!( - "../../testdata/fixtures/SolidityGeneration/GeneratedUnnamedInterface.sol" + "../../../testdata/fixtures/SolidityGeneration/GeneratedUnnamedInterface.sol" ), abi_to_solidity(&contract_abi, "").unwrap() ); @@ -357,11 +359,13 @@ mod tests { #[cfg(any(target_os = "linux", target_os = "macos"))] fn abi2solidity_gaugecontroller() { let contract_abi: RawAbi = serde_json::from_str(include_str!( - "../../testdata/fixtures/SolidityGeneration/GaugeController.json" + "../../../testdata/fixtures/SolidityGeneration/GaugeController.json" )) .unwrap(); pretty_assertions::assert_eq!( - include_str!("../../testdata/fixtures/SolidityGeneration/GeneratedGaugeController.sol"), + include_str!( + "../../../testdata/fixtures/SolidityGeneration/GeneratedGaugeController.sol" + ), abi_to_solidity(&contract_abi, "test").unwrap() ); } @@ -369,12 +373,12 @@ mod tests { #[cfg(any(target_os = "linux", target_os = "macos"))] fn abi2dolidity_liquiditygauge() { let contract_abi: RawAbi = serde_json::from_str(include_str!( - "../../testdata/fixtures/SolidityGeneration/LiquidityGaugeV4.json" + "../../../testdata/fixtures/SolidityGeneration/LiquidityGaugeV4.json" )) .unwrap(); pretty_assertions::assert_eq!( include_str!( - "../../testdata/fixtures/SolidityGeneration/GeneratedLiquidityGaugeV4.sol" + "../../../testdata/fixtures/SolidityGeneration/GeneratedLiquidityGaugeV4.sol" ), abi_to_solidity(&contract_abi, "test").unwrap() ); @@ -383,11 +387,11 @@ mod tests { #[cfg(any(target_os = "linux", target_os = "macos"))] fn abi2solidity_fastlane() { let contract_abi: RawAbi = serde_json::from_str(include_str!( - "../../testdata/fixtures/SolidityGeneration/Fastlane.json" + "../../../testdata/fixtures/SolidityGeneration/Fastlane.json" )) .unwrap(); pretty_assertions::assert_eq!( - include_str!("../../testdata/fixtures/SolidityGeneration/GeneratedFastLane.sol"), + include_str!("../../../testdata/fixtures/SolidityGeneration/GeneratedFastLane.sol"), abi_to_solidity(&contract_abi, "test").unwrap() ); } @@ -396,11 +400,11 @@ mod tests { #[cfg(any(target_os = "linux", target_os = "macos"))] fn abi2solidity_with_structs() { let contract_abi: RawAbi = serde_json::from_str(include_str!( - "../../testdata/fixtures/SolidityGeneration/WithStructs.json" + "../../../testdata/fixtures/SolidityGeneration/WithStructs.json" )) .unwrap(); pretty_assertions::assert_eq!( - include_str!("../../testdata/fixtures/SolidityGeneration/WithStructs.sol").trim(), + include_str!("../../../testdata/fixtures/SolidityGeneration/WithStructs.sol").trim(), abi_to_solidity(&contract_abi, "test").unwrap().trim() ); } diff --git a/utils/src/error.rs b/crates/utils/src/error.rs similarity index 100% rename from utils/src/error.rs rename to crates/utils/src/error.rs diff --git a/utils/src/glob.rs b/crates/utils/src/glob.rs similarity index 100% rename from utils/src/glob.rs rename to crates/utils/src/glob.rs diff --git a/utils/src/lib.rs b/crates/utils/src/lib.rs similarity index 99% rename from utils/src/lib.rs rename to crates/utils/src/lib.rs index 0a37545c25b89..8b577acc45446 100644 --- a/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -528,8 +528,8 @@ mod tests { fn new(path: impl Into) -> Self { let path = path.into(); let paths = ProjectPathsConfig::builder() - .root("../testdata/linking") - .lib("../testdata/lib") + .root("../../testdata/linking") + .lib("../../testdata/lib") .sources(path.clone()) .tests(path) .build() @@ -608,7 +608,7 @@ mod tests { #[test] fn link_simple() { - LinkerTest::new("../testdata/linking/simple") + LinkerTest::new("../../testdata/linking/simple") .assert_dependencies("simple/Simple.t.sol:Lib".to_string(), vec![]) .assert_dependencies( "simple/Simple.t.sol:LibraryConsumer".to_string(), @@ -631,7 +631,7 @@ mod tests { #[test] fn link_nested() { - LinkerTest::new("../testdata/linking/nested") + LinkerTest::new("../../testdata/linking/nested") .assert_dependencies("nested/Nested.t.sol:Lib".to_string(), vec![]) .assert_dependencies( "nested/Nested.t.sol:NestedLib".to_string(), @@ -699,7 +699,7 @@ mod tests { /// increment larger than the previous largest nonce. #[test] fn link_duplicate() { - LinkerTest::new("../testdata/linking/duplicate") + LinkerTest::new("../../testdata/linking/duplicate") .assert_dependencies("duplicate/Duplicate.t.sol:A".to_string(), vec![]) .assert_dependencies("duplicate/Duplicate.t.sol:B".to_string(), vec![]) .assert_dependencies( diff --git a/utils/src/path.rs b/crates/utils/src/path.rs similarity index 100% rename from utils/src/path.rs rename to crates/utils/src/path.rs diff --git a/utils/src/rpc.rs b/crates/utils/src/rpc.rs similarity index 100% rename from utils/src/rpc.rs rename to crates/utils/src/rpc.rs diff --git a/forge/tests/it/inline.rs b/forge/tests/it/inline.rs deleted file mode 100644 index 681b3ca890440..0000000000000 --- a/forge/tests/it/inline.rs +++ /dev/null @@ -1,114 +0,0 @@ -#[cfg(test)] -mod tests { - use crate::{ - config::runner, - test_helpers::{filter::Filter, COMPILED, PROJECT}, - }; - use forge::{ - result::{SuiteResult, TestKind, TestResult}, - TestOptions, TestOptionsBuilder, - }; - use foundry_config::{FuzzConfig, InvariantConfig}; - - #[tokio::test(flavor = "multi_thread")] - async fn inline_config_run_fuzz() { - let opts = test_options(); - - let filter = Filter::new(".*", ".*", ".*inline/FuzzInlineConf.t.sol"); - - let mut runner = runner().await; - runner.test_options = opts.clone(); - - let result = runner.test(&filter, None, opts).await; - let suite_result: &SuiteResult = - result.get("inline/FuzzInlineConf.t.sol:FuzzInlineConf").unwrap(); - let test_result: &TestResult = - suite_result.test_results.get("testInlineConfFuzz(uint8)").unwrap(); - match &test_result.kind { - TestKind::Fuzz { runs, .. } => { - assert_eq!(runs, &1024); - } - _ => { - unreachable!() - } - } - } - - #[tokio::test(flavor = "multi_thread")] - async fn inline_config_run_invariant() { - const ROOT: &str = "inline/InvariantInlineConf.t.sol"; - - let opts = test_options(); - let filter = Filter::new(".*", ".*", ".*inline/InvariantInlineConf.t.sol"); - let mut runner = runner().await; - runner.test_options = opts.clone(); - - let result = runner.test(&filter, None, opts).await; - - let suite_result_1 = - result.get(&format!("{ROOT}:InvariantInlineConf")).expect("Result exists"); - let suite_result_2 = - result.get(&format!("{ROOT}:InvariantInlineConf2")).expect("Result exists"); - - let test_result_1 = suite_result_1.test_results.get("invariant_neverFalse()").unwrap(); - let test_result_2 = suite_result_2.test_results.get("invariant_neverFalse()").unwrap(); - - match &test_result_1.kind { - TestKind::Invariant { runs, .. } => { - assert_eq!(runs, &333); - } - _ => { - unreachable!() - } - } - - match &test_result_2.kind { - TestKind::Invariant { runs, .. } => { - assert_eq!(runs, &42); - } - _ => { - unreachable!() - } - } - } - - #[test] - fn build_test_options() { - let root = &PROJECT.paths.root; - let profiles = vec!["default".to_string(), "ci".to_string()]; - let build_result = TestOptionsBuilder::default() - .fuzz(FuzzConfig::default()) - .invariant(InvariantConfig::default()) - .compile_output(&COMPILED) - .profiles(profiles) - .build(root); - - assert!(build_result.is_ok()); - } - - #[test] - fn build_test_options_just_one_valid_profile() { - let root = &PROJECT.paths.root; - let valid_profiles = vec!["profile-sheldon-cooper".to_string()]; - let build_result = TestOptionsBuilder::default() - .fuzz(FuzzConfig::default()) - .invariant(InvariantConfig::default()) - .compile_output(&COMPILED) - .profiles(valid_profiles) - .build(root); - - // We expect an error, since COMPILED contains in-line - // per-test configs for "default" and "ci" profiles - assert!(build_result.is_err()); - } - - fn test_options() -> TestOptions { - let root = &PROJECT.paths.root; - TestOptionsBuilder::default() - .fuzz(FuzzConfig::default()) - .invariant(InvariantConfig::default()) - .compile_output(&COMPILED) - .build(root) - .expect("Config loaded") - } -} diff --git a/rustfmt.toml b/rustfmt.toml index d795534e2bd0d..3b4a88a3cd6f2 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -9,4 +9,4 @@ trailing_semicolon = false use_field_init_shorthand = true # Ignore automatically-generated code. -ignore = ["abi/src/bindings"] +ignore = ["crates/abi/src/bindings"] diff --git a/testdata/cheats/Derive.t.sol b/testdata/cheats/Derive.t.sol index c14512f0be6d5..868ed790bc722 100644 --- a/testdata/cheats/Derive.t.sol +++ b/testdata/cheats/Derive.t.sol @@ -16,7 +16,7 @@ contract DeriveTest is DSTest { uint256 privateKeyDerivationPathChanged = vm.deriveKey(mnemonic, "m/44'/60'/0'/1/", 0); assertEq(privateKeyDerivationPathChanged, 0x6abb89895f93b02c1b9470db0fa675297f6cca832a5fc66d5dfd7661a42b37be); - uint256 privateKeyFile = vm.deriveKey("../testdata/fixtures/Derive/mnemonic_english.txt", 2); + uint256 privateKeyFile = vm.deriveKey("fixtures/Derive/mnemonic_english.txt", 2); assertEq(privateKeyFile, 0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a); } @@ -94,7 +94,7 @@ contract DeriveTest is DSTest { uint256 privateKeyDerivationPathChanged = vm.deriveKey(mnemonic, "m/44'/60'/0'/1/", 0, language); assertEq(privateKeyDerivationPathChanged, privateKeysDerivationPathChanged[i]); - string memory prefix = "../testdata/fixtures/Derive/mnemonic_"; + string memory prefix = "fixtures/Derive/mnemonic_"; string memory postfix = ".txt"; string memory mnemonicPath = string(abi.encodePacked(prefix, language, postfix)); uint256 privateKeyFile = vm.deriveKey(mnemonicPath, 2, language); diff --git a/testdata/cheats/Fs.t.sol b/testdata/cheats/Fs.t.sol index fcd74a37083f7..482c6b871dabc 100644 --- a/testdata/cheats/Fs.t.sol +++ b/testdata/cheats/Fs.t.sol @@ -70,7 +70,7 @@ contract FsTest is DSTest { function testReadFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; assertEq(vm.readFile(path), "hello readable world\nthis is the second line!"); @@ -84,7 +84,7 @@ contract FsTest is DSTest { function testReadLine() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; assertEq(vm.readLine(path), "hello readable world"); assertEq(vm.readLine(path), "this is the second line!"); @@ -97,7 +97,7 @@ contract FsTest is DSTest { function testWriteFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; string memory data = "hello writable world"; vm.writeFile(path, data); @@ -114,7 +114,7 @@ contract FsTest is DSTest { function testWriteLine() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_line.txt"; + string memory path = "fixtures/File/write_line.txt"; string memory line1 = "first line"; vm.writeLine(path, line1); @@ -131,7 +131,7 @@ contract FsTest is DSTest { } function testCloseFile() public { - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; assertEq(vm.readLine(path), "hello readable world"); vm.closeFile(path); @@ -141,7 +141,7 @@ contract FsTest is DSTest { function testRemoveFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/remove_file.txt"; + string memory path = "fixtures/File/remove_file.txt"; string memory data = "hello writable world"; vm.writeFile(path, data); @@ -198,7 +198,7 @@ contract FsTest is DSTest { function testReadDir() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/Dir"; + string memory path = "fixtures/Dir"; { Vm.DirEntry[] memory entries = vm.readDir(path); @@ -235,7 +235,7 @@ contract FsTest is DSTest { function testCreateRemoveDir() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/Dir/remove_dir"; + string memory path = "fixtures/Dir/remove_dir"; string memory child = string.concat(path, "/child"); vm.createDir(path, false); @@ -263,7 +263,7 @@ contract FsTest is DSTest { function testFsMetadata() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File"; + string memory path = "fixtures/File"; Vm.FsMetadata memory metadata = vm.fsMetadata(path); assertEq(metadata.isDir, true); assertEq(metadata.isSymlink, false); @@ -274,11 +274,11 @@ contract FsTest is DSTest { // assertGt(metadata.accessed, 0); // assertGt(metadata.created, 0); - path = "../testdata/fixtures/File/read.txt"; + path = "fixtures/File/read.txt"; metadata = vm.fsMetadata(path); assertEq(metadata.isDir, false); - path = "../testdata/fixtures/File/symlink"; + path = "fixtures/File/symlink"; metadata = vm.fsMetadata(path); assertEq(metadata.isSymlink, false); diff --git a/testdata/cheats/GetCode.t.sol b/testdata/cheats/GetCode.t.sol index d4b45005444dd..ee62fc44d61fd 100644 --- a/testdata/cheats/GetCode.t.sol +++ b/testdata/cheats/GetCode.t.sol @@ -8,7 +8,7 @@ contract GetCodeTest is DSTest { Vm constant vm = Vm(HEVM_ADDRESS); function testGetCode() public { - bytes memory fullPath = vm.getCode("../testdata/fixtures/GetCode/WorkingContract.json"); + bytes memory fullPath = vm.getCode("fixtures/GetCode/WorkingContract.json"); //bytes memory fileOnly = vm.getCode("WorkingContract.sol"); //bytes memory fileAndContractName = vm.getCode("WorkingContract.sol:WorkingContract"); @@ -33,7 +33,7 @@ contract GetCodeTest is DSTest { } function testGetCodeHardhatArtifact() public { - bytes memory fullPath = vm.getCode("../testdata/fixtures/GetCode/HardhatWorkingContract.json"); + bytes memory fullPath = vm.getCode("fixtures/GetCode/HardhatWorkingContract.json"); string memory expected = string( bytes( @@ -44,7 +44,7 @@ contract GetCodeTest is DSTest { } function testGetCodeHuffArtifact() public { - string memory path = "../testdata/fixtures/GetCode/HuffWorkingContract.json"; + string memory path = "fixtures/GetCode/HuffWorkingContract.json"; bytes memory bytecode = vm.getCode(path); string memory expected = string( bytes( diff --git a/testdata/cheats/GetDeployedCode.t.sol b/testdata/cheats/GetDeployedCode.t.sol index 69b2da49c2a91..926945049bc0f 100644 --- a/testdata/cheats/GetDeployedCode.t.sol +++ b/testdata/cheats/GetDeployedCode.t.sol @@ -12,7 +12,7 @@ contract GetDeployedCodeTest is DSTest { event Payload(address sender, address target, bytes data); function testGetCode() public { - bytes memory fullPath = vm.getDeployedCode("../testdata/fixtures/GetCode/Override.json"); + bytes memory fullPath = vm.getDeployedCode("fixtures/GetCode/Override.json"); string memory expected = string( bytes( hex"60806040526004361061001e5760003560e01c806340e04f5e14610023575b600080fd5b610036610031366004610091565b610048565b60405190815260200160405180910390f35b60007fda9986ad4da7abb3f55b2d1f2009ab6ee50c5ad054092c04464c112acc4bc1103385858560405161007f9493929190610122565b60405180910390a15060009392505050565b6000806000604084860312156100a657600080fd5b83356001600160a01b03811681146100bd57600080fd5b9250602084013567ffffffffffffffff808211156100da57600080fd5b818601915086601f8301126100ee57600080fd5b8135818111156100fd57600080fd5b87602082850101111561010f57600080fd5b6020830194508093505050509250925092565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f85011683010190509594505050505056fea26469706673582212202b0ba0fa4073d6f681bb1f99f0529e44583f2dc612a629f3ff0564eaa7257d1f64736f6c63430008110033" @@ -23,7 +23,7 @@ contract GetDeployedCodeTest is DSTest { // this will set the deployed bytecode of the stateless contract to the `overrideAddress` and call the function that emits an event that will be `expectEmitted` function testCanEtchStatelessOverride() public { - bytes memory code = vm.getDeployedCode("../testdata/fixtures/GetCode/Override.json"); + bytes memory code = vm.getDeployedCode("fixtures/GetCode/Override.json"); vm.etch(overrideAddress, code); assertEq( overrideAddress.code, diff --git a/testdata/cheats/Json.t.sol b/testdata/cheats/Json.t.sol index 624e4c326674c..fca9d8a546a71 100644 --- a/testdata/cheats/Json.t.sol +++ b/testdata/cheats/Json.t.sol @@ -10,7 +10,7 @@ contract ParseJsonTest is DSTest { string json; function setUp() public { - string memory path = "../testdata/fixtures/Json/test.json"; + string memory path = "fixtures/Json/test.json"; json = vm.readFile(path); } @@ -85,7 +85,7 @@ contract ParseJsonTest is DSTest { function test_wholeObject() public { // we need to make the path relative to the crate that's running tests for it (forge crate) - string memory path = "../testdata/fixtures/Json/wholeJson.json"; + string memory path = "fixtures/Json/wholeJson.json"; console.log(path); json = vm.readFile(path); bytes memory data = vm.parseJson(json); @@ -219,7 +219,7 @@ contract WriteJsonTest is DSTest { data3[2] = bytes("fpovhpgjaiosfjhapiufpsdf"); string memory finalJson = vm.serializeBytes(json1, "array3", data3); - string memory path = "../testdata/fixtures/Json/write_test_array.json"; + string memory path = "fixtures/Json/write_test_array.json"; vm.writeJson(finalJson, path); string memory json = vm.readFile(path); @@ -259,7 +259,7 @@ contract WriteJsonTest is DSTest { function test_serializeNotSimpleJson() public { string memory json3 = "json3"; - string memory path = "../testdata/fixtures/Json/write_complex_test.json"; + string memory path = "fixtures/Json/write_complex_test.json"; vm.serializeUint(json3, "a", uint256(123)); string memory semiFinal = vm.serializeString(json3, "b", "test"); string memory finalJson = vm.serializeString(json3, "c", semiFinal); @@ -271,7 +271,7 @@ contract WriteJsonTest is DSTest { } function test_retrieveEntireJson() public { - string memory path = "../testdata/fixtures/Json/write_complex_test.json"; + string memory path = "fixtures/Json/write_complex_test.json"; string memory json = vm.readFile(path); bytes memory data = vm.parseJson(json, "."); notSimpleJson memory decodedData = abi.decode(data, (notSimpleJson)); @@ -280,14 +280,14 @@ contract WriteJsonTest is DSTest { } function test_checkKeyExists() public { - string memory path = "../testdata/fixtures/Json/write_complex_test.json"; + string memory path = "fixtures/Json/write_complex_test.json"; string memory json = vm.readFile(path); bool exists = vm.keyExists(json, "a"); assertTrue(exists); } function test_checkKeyDoesNotExist() public { - string memory path = "../testdata/fixtures/Json/write_complex_test.json"; + string memory path = "fixtures/Json/write_complex_test.json"; string memory json = vm.readFile(path); bool exists = vm.keyExists(json, "d"); assertTrue(!exists); @@ -295,7 +295,7 @@ contract WriteJsonTest is DSTest { function test_writeJson() public { string memory json3 = "json3"; - string memory path = "../testdata/fixtures/Json/write_test.json"; + string memory path = "fixtures/Json/write_test.json"; vm.serializeUint(json3, "a", uint256(123)); string memory finalJson = vm.serializeString(json3, "b", "test"); vm.writeJson(finalJson, path); diff --git a/testdata/fs/Default.t.sol b/testdata/fs/Default.t.sol index ad5e8c14d225c..a745608218da1 100644 --- a/testdata/fs/Default.t.sol +++ b/testdata/fs/Default.t.sol @@ -57,24 +57,24 @@ contract DefaultAccessTest is DSTest { FsProxy public fsProxy; bytes constant FOUNDRY_WRITE_ERR = - "The path \"../testdata/fixtures/File/write_file.txt\" is not allowed to be accessed for write operations."; + "The path \"fixtures/File/write_file.txt\" is not allowed to be accessed for write operations."; function testReadFile() public { - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; vm.readFile(path); vm.readFileBinary(path); } function testReadLine() public { - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; vm.readLine(path); } function testWriteFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; string memory data = "hello writable world"; vm.expectRevert(FOUNDRY_WRITE_ERR); @@ -87,7 +87,7 @@ contract DefaultAccessTest is DSTest { function testWriteLine() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; string memory data = "hello writable world"; vm.expectRevert(FOUNDRY_WRITE_ERR); @@ -97,7 +97,7 @@ contract DefaultAccessTest is DSTest { function testRemoveFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; vm.expectRevert(FOUNDRY_WRITE_ERR); fsProxy.removeFile(path); diff --git a/testdata/fs/Disabled.t.sol b/testdata/fs/Disabled.t.sol index 4a03a0a545fcf..6af6d83c8f174 100644 --- a/testdata/fs/Disabled.t.sol +++ b/testdata/fs/Disabled.t.sol @@ -57,28 +57,28 @@ contract DisabledTest is DSTest { FsProxy public fsProxy; bytes constant FOUNDRY_READ_ERR = - "The path \"../testdata/fixtures/File/read.txt\" is not allowed to be accessed for read operations."; + "The path \"fixtures/File/read.txt\" is not allowed to be accessed for read operations."; bytes constant FOUNDRY_WRITE_ERR = - "The path \"../testdata/fixtures/File/write_file.txt\" is not allowed to be accessed for write operations."; + "The path \"fixtures/File/write_file.txt\" is not allowed to be accessed for write operations."; function testReadFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; vm.expectRevert(FOUNDRY_READ_ERR); fsProxy.readFile(path); } function testReadLine() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/read.txt"; + string memory path = "fixtures/File/read.txt"; vm.expectRevert(FOUNDRY_READ_ERR); fsProxy.readLine(path); } function testWriteFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; string memory data = "hello writable world"; vm.expectRevert(FOUNDRY_WRITE_ERR); fsProxy.writeFile(path, data); @@ -86,7 +86,7 @@ contract DisabledTest is DSTest { function testWriteLine() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; string memory data = "hello writable world"; vm.expectRevert(FOUNDRY_WRITE_ERR); fsProxy.writeLine(path, data); @@ -94,7 +94,7 @@ contract DisabledTest is DSTest { function testRemoveFile() public { fsProxy = new FsProxy(); - string memory path = "../testdata/fixtures/File/write_file.txt"; + string memory path = "fixtures/File/write_file.txt"; vm.expectRevert(FOUNDRY_WRITE_ERR); fsProxy.removeFile(path); } diff --git a/testdata/repros/Issue4630.t.sol b/testdata/repros/Issue4630.t.sol index fa8efde2128e7..6df4a05eb0352 100644 --- a/testdata/repros/Issue4630.t.sol +++ b/testdata/repros/Issue4630.t.sol @@ -9,14 +9,14 @@ contract Issue4630Test is DSTest { Vm constant vm = Vm(HEVM_ADDRESS); function testExistingValue() public { - string memory path = "../testdata/fixtures/Json/Issue4630.json"; + string memory path = "fixtures/Json/Issue4630.json"; string memory json = vm.readFile(path); uint256 val = vm.parseJsonUint(json, ".local.prop1"); assertEq(val, 10); } function testMissingValue() public { - string memory path = "../testdata/fixtures/Json/Issue4630.json"; + string memory path = "fixtures/Json/Issue4630.json"; string memory json = vm.readFile(path); vm.expectRevert(); uint256 val = this.parseJsonUint(json, ".localempty.prop1");