From cd4914d37f0581840e93f1555133be5fe6e4dd68 Mon Sep 17 00:00:00 2001 From: Georgios Konstantopoulos Date: Mon, 1 Jun 2020 21:24:22 +0300 Subject: [PATCH] refactor: pull crates to root dir --- Cargo.toml | 10 +++++----- {crates/ethers-contract => ethers-contract}/Cargo.toml | 0 .../ethers-contract-abigen/Cargo.toml | 0 .../ethers-contract-abigen/README.md | 0 .../ethers-contract-abigen/examples/abigen.rs | 0 .../ethers-contract-abigen/src/contract.rs | 0 .../ethers-contract-abigen/src/contract/common.rs | 0 .../ethers-contract-abigen/src/contract/events.rs | 0 .../ethers-contract-abigen/src/contract/methods.rs | 0 .../ethers-contract-abigen/src/contract/types.rs | 0 .../ethers-contract-abigen/src/lib.rs | 0 .../ethers-contract-abigen/src/rustfmt.rs | 0 .../ethers-contract-abigen/src/source.rs | 0 .../ethers-contract-abigen/src/test/macros.rs | 0 .../ethers-contract-abigen/src/util.rs | 0 .../ethers-contract-abigen/token.rs | 0 .../ethers-contract-derive/Cargo.toml | 0 .../ethers-contract-derive/src/abigen.rs | 0 .../ethers-contract-derive/src/lib.rs | 0 .../ethers-contract-derive/src/spanned.rs | 0 .../ethers-contract => ethers-contract}/src/call.rs | 0 .../src/contract.rs | 0 .../ethers-contract => ethers-contract}/src/event.rs | 0 .../ethers-contract => ethers-contract}/src/factory.rs | 0 {crates/ethers-contract => ethers-contract}/src/lib.rs | 0 {crates/ethers-core => ethers-core}/Cargo.toml | 0 {crates/ethers-core => ethers-core}/src/abi/mod.rs | 0 {crates/ethers-core => ethers-core}/src/abi/tokens.rs | 0 {crates/ethers-core => ethers-core}/src/lib.rs | 0 .../src/types/chainstate/block.rs | 0 .../src/types/chainstate/bytes.rs | 0 .../src/types/chainstate/ens.rs | 0 .../src/types/chainstate/log.rs | 0 .../src/types/chainstate/mod.rs | 0 .../src/types/chainstate/transaction.rs | 0 .../src/types/crypto/keys.rs | 0 .../src/types/crypto/mod.rs | 0 .../src/types/crypto/signature.rs | 0 {crates/ethers-core => ethers-core}/src/types/mod.rs | 0 .../ethers-core => ethers-core}/src/utils/ganache.rs | 0 {crates/ethers-core => ethers-core}/src/utils/hash.rs | 0 {crates/ethers-core => ethers-core}/src/utils/mod.rs | 0 {crates/ethers-core => ethers-core}/src/utils/solc.rs | 0 .../ethers-providers => ethers-providers}/Cargo.toml | 0 .../ethers-providers => ethers-providers}/src/ens.rs | 0 .../ethers-providers => ethers-providers}/src/http.rs | 0 .../ethers-providers => ethers-providers}/src/lib.rs | 0 .../src/networks.rs | 0 .../src/provider.rs | 0 {crates/ethers-signers => ethers-signers}/Cargo.toml | 0 .../ethers-signers => ethers-signers}/src/client.rs | 0 {crates/ethers-signers => ethers-signers}/src/lib.rs | 0 .../ethers-signers => ethers-signers}/src/wallet.rs | 0 {crates/ethers => ethers}/Cargo.toml | 0 {crates/ethers => ethers}/examples/contract.rs | 0 {crates/ethers => ethers}/examples/contract.sol | 0 {crates/ethers => ethers}/examples/ens.rs | 0 {crates/ethers => ethers}/examples/get_logs.rs | 0 {crates/ethers => ethers}/examples/local_signer.rs | 0 {crates/ethers => ethers}/examples/sign.rs | 0 {crates/ethers => ethers}/examples/transfer_eth.rs | 0 {crates/ethers => ethers}/src/lib.rs | 0 62 files changed, 5 insertions(+), 5 deletions(-) rename {crates/ethers-contract => ethers-contract}/Cargo.toml (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/Cargo.toml (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/README.md (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/examples/abigen.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/contract.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/contract/common.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/contract/events.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/contract/methods.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/contract/types.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/lib.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/rustfmt.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/source.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/test/macros.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/src/util.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-abigen/token.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-derive/Cargo.toml (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-derive/src/abigen.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-derive/src/lib.rs (100%) rename {crates/ethers-contract => ethers-contract}/ethers-contract-derive/src/spanned.rs (100%) rename {crates/ethers-contract => ethers-contract}/src/call.rs (100%) rename {crates/ethers-contract => ethers-contract}/src/contract.rs (100%) rename {crates/ethers-contract => ethers-contract}/src/event.rs (100%) rename {crates/ethers-contract => ethers-contract}/src/factory.rs (100%) rename {crates/ethers-contract => ethers-contract}/src/lib.rs (100%) rename {crates/ethers-core => ethers-core}/Cargo.toml (100%) rename {crates/ethers-core => ethers-core}/src/abi/mod.rs (100%) rename {crates/ethers-core => ethers-core}/src/abi/tokens.rs (100%) rename {crates/ethers-core => ethers-core}/src/lib.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/chainstate/block.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/chainstate/bytes.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/chainstate/ens.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/chainstate/log.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/chainstate/mod.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/chainstate/transaction.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/crypto/keys.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/crypto/mod.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/crypto/signature.rs (100%) rename {crates/ethers-core => ethers-core}/src/types/mod.rs (100%) rename {crates/ethers-core => ethers-core}/src/utils/ganache.rs (100%) rename {crates/ethers-core => ethers-core}/src/utils/hash.rs (100%) rename {crates/ethers-core => ethers-core}/src/utils/mod.rs (100%) rename {crates/ethers-core => ethers-core}/src/utils/solc.rs (100%) rename {crates/ethers-providers => ethers-providers}/Cargo.toml (100%) rename {crates/ethers-providers => ethers-providers}/src/ens.rs (100%) rename {crates/ethers-providers => ethers-providers}/src/http.rs (100%) rename {crates/ethers-providers => ethers-providers}/src/lib.rs (100%) rename {crates/ethers-providers => ethers-providers}/src/networks.rs (100%) rename {crates/ethers-providers => ethers-providers}/src/provider.rs (100%) rename {crates/ethers-signers => ethers-signers}/Cargo.toml (100%) rename {crates/ethers-signers => ethers-signers}/src/client.rs (100%) rename {crates/ethers-signers => ethers-signers}/src/lib.rs (100%) rename {crates/ethers-signers => ethers-signers}/src/wallet.rs (100%) rename {crates/ethers => ethers}/Cargo.toml (100%) rename {crates/ethers => ethers}/examples/contract.rs (100%) rename {crates/ethers => ethers}/examples/contract.sol (100%) rename {crates/ethers => ethers}/examples/ens.rs (100%) rename {crates/ethers => ethers}/examples/get_logs.rs (100%) rename {crates/ethers => ethers}/examples/local_signer.rs (100%) rename {crates/ethers => ethers}/examples/sign.rs (100%) rename {crates/ethers => ethers}/examples/transfer_eth.rs (100%) rename {crates/ethers => ethers}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index ea39ee92..f6e967a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [workspace] members = [ - "./crates/ethers", - "./crates/ethers-contract", - "./crates/ethers-providers", - "./crates/ethers-signers", - "./crates/ethers-core", + "./ethers", + "./ethers-contract", + "./ethers-providers", + "./ethers-signers", + "./ethers-core", ] diff --git a/crates/ethers-contract/Cargo.toml b/ethers-contract/Cargo.toml similarity index 100% rename from crates/ethers-contract/Cargo.toml rename to ethers-contract/Cargo.toml diff --git a/crates/ethers-contract/ethers-contract-abigen/Cargo.toml b/ethers-contract/ethers-contract-abigen/Cargo.toml similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/Cargo.toml rename to ethers-contract/ethers-contract-abigen/Cargo.toml diff --git a/crates/ethers-contract/ethers-contract-abigen/README.md b/ethers-contract/ethers-contract-abigen/README.md similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/README.md rename to ethers-contract/ethers-contract-abigen/README.md diff --git a/crates/ethers-contract/ethers-contract-abigen/examples/abigen.rs b/ethers-contract/ethers-contract-abigen/examples/abigen.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/examples/abigen.rs rename to ethers-contract/ethers-contract-abigen/examples/abigen.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/contract.rs b/ethers-contract/ethers-contract-abigen/src/contract.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/contract.rs rename to ethers-contract/ethers-contract-abigen/src/contract.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/contract/common.rs b/ethers-contract/ethers-contract-abigen/src/contract/common.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/contract/common.rs rename to ethers-contract/ethers-contract-abigen/src/contract/common.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/contract/events.rs b/ethers-contract/ethers-contract-abigen/src/contract/events.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/contract/events.rs rename to ethers-contract/ethers-contract-abigen/src/contract/events.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/contract/methods.rs b/ethers-contract/ethers-contract-abigen/src/contract/methods.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/contract/methods.rs rename to ethers-contract/ethers-contract-abigen/src/contract/methods.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/contract/types.rs b/ethers-contract/ethers-contract-abigen/src/contract/types.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/contract/types.rs rename to ethers-contract/ethers-contract-abigen/src/contract/types.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/lib.rs b/ethers-contract/ethers-contract-abigen/src/lib.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/lib.rs rename to ethers-contract/ethers-contract-abigen/src/lib.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/rustfmt.rs b/ethers-contract/ethers-contract-abigen/src/rustfmt.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/rustfmt.rs rename to ethers-contract/ethers-contract-abigen/src/rustfmt.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/source.rs b/ethers-contract/ethers-contract-abigen/src/source.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/source.rs rename to ethers-contract/ethers-contract-abigen/src/source.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/test/macros.rs b/ethers-contract/ethers-contract-abigen/src/test/macros.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/test/macros.rs rename to ethers-contract/ethers-contract-abigen/src/test/macros.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/src/util.rs b/ethers-contract/ethers-contract-abigen/src/util.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/src/util.rs rename to ethers-contract/ethers-contract-abigen/src/util.rs diff --git a/crates/ethers-contract/ethers-contract-abigen/token.rs b/ethers-contract/ethers-contract-abigen/token.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-abigen/token.rs rename to ethers-contract/ethers-contract-abigen/token.rs diff --git a/crates/ethers-contract/ethers-contract-derive/Cargo.toml b/ethers-contract/ethers-contract-derive/Cargo.toml similarity index 100% rename from crates/ethers-contract/ethers-contract-derive/Cargo.toml rename to ethers-contract/ethers-contract-derive/Cargo.toml diff --git a/crates/ethers-contract/ethers-contract-derive/src/abigen.rs b/ethers-contract/ethers-contract-derive/src/abigen.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-derive/src/abigen.rs rename to ethers-contract/ethers-contract-derive/src/abigen.rs diff --git a/crates/ethers-contract/ethers-contract-derive/src/lib.rs b/ethers-contract/ethers-contract-derive/src/lib.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-derive/src/lib.rs rename to ethers-contract/ethers-contract-derive/src/lib.rs diff --git a/crates/ethers-contract/ethers-contract-derive/src/spanned.rs b/ethers-contract/ethers-contract-derive/src/spanned.rs similarity index 100% rename from crates/ethers-contract/ethers-contract-derive/src/spanned.rs rename to ethers-contract/ethers-contract-derive/src/spanned.rs diff --git a/crates/ethers-contract/src/call.rs b/ethers-contract/src/call.rs similarity index 100% rename from crates/ethers-contract/src/call.rs rename to ethers-contract/src/call.rs diff --git a/crates/ethers-contract/src/contract.rs b/ethers-contract/src/contract.rs similarity index 100% rename from crates/ethers-contract/src/contract.rs rename to ethers-contract/src/contract.rs diff --git a/crates/ethers-contract/src/event.rs b/ethers-contract/src/event.rs similarity index 100% rename from crates/ethers-contract/src/event.rs rename to ethers-contract/src/event.rs diff --git a/crates/ethers-contract/src/factory.rs b/ethers-contract/src/factory.rs similarity index 100% rename from crates/ethers-contract/src/factory.rs rename to ethers-contract/src/factory.rs diff --git a/crates/ethers-contract/src/lib.rs b/ethers-contract/src/lib.rs similarity index 100% rename from crates/ethers-contract/src/lib.rs rename to ethers-contract/src/lib.rs diff --git a/crates/ethers-core/Cargo.toml b/ethers-core/Cargo.toml similarity index 100% rename from crates/ethers-core/Cargo.toml rename to ethers-core/Cargo.toml diff --git a/crates/ethers-core/src/abi/mod.rs b/ethers-core/src/abi/mod.rs similarity index 100% rename from crates/ethers-core/src/abi/mod.rs rename to ethers-core/src/abi/mod.rs diff --git a/crates/ethers-core/src/abi/tokens.rs b/ethers-core/src/abi/tokens.rs similarity index 100% rename from crates/ethers-core/src/abi/tokens.rs rename to ethers-core/src/abi/tokens.rs diff --git a/crates/ethers-core/src/lib.rs b/ethers-core/src/lib.rs similarity index 100% rename from crates/ethers-core/src/lib.rs rename to ethers-core/src/lib.rs diff --git a/crates/ethers-core/src/types/chainstate/block.rs b/ethers-core/src/types/chainstate/block.rs similarity index 100% rename from crates/ethers-core/src/types/chainstate/block.rs rename to ethers-core/src/types/chainstate/block.rs diff --git a/crates/ethers-core/src/types/chainstate/bytes.rs b/ethers-core/src/types/chainstate/bytes.rs similarity index 100% rename from crates/ethers-core/src/types/chainstate/bytes.rs rename to ethers-core/src/types/chainstate/bytes.rs diff --git a/crates/ethers-core/src/types/chainstate/ens.rs b/ethers-core/src/types/chainstate/ens.rs similarity index 100% rename from crates/ethers-core/src/types/chainstate/ens.rs rename to ethers-core/src/types/chainstate/ens.rs diff --git a/crates/ethers-core/src/types/chainstate/log.rs b/ethers-core/src/types/chainstate/log.rs similarity index 100% rename from crates/ethers-core/src/types/chainstate/log.rs rename to ethers-core/src/types/chainstate/log.rs diff --git a/crates/ethers-core/src/types/chainstate/mod.rs b/ethers-core/src/types/chainstate/mod.rs similarity index 100% rename from crates/ethers-core/src/types/chainstate/mod.rs rename to ethers-core/src/types/chainstate/mod.rs diff --git a/crates/ethers-core/src/types/chainstate/transaction.rs b/ethers-core/src/types/chainstate/transaction.rs similarity index 100% rename from crates/ethers-core/src/types/chainstate/transaction.rs rename to ethers-core/src/types/chainstate/transaction.rs diff --git a/crates/ethers-core/src/types/crypto/keys.rs b/ethers-core/src/types/crypto/keys.rs similarity index 100% rename from crates/ethers-core/src/types/crypto/keys.rs rename to ethers-core/src/types/crypto/keys.rs diff --git a/crates/ethers-core/src/types/crypto/mod.rs b/ethers-core/src/types/crypto/mod.rs similarity index 100% rename from crates/ethers-core/src/types/crypto/mod.rs rename to ethers-core/src/types/crypto/mod.rs diff --git a/crates/ethers-core/src/types/crypto/signature.rs b/ethers-core/src/types/crypto/signature.rs similarity index 100% rename from crates/ethers-core/src/types/crypto/signature.rs rename to ethers-core/src/types/crypto/signature.rs diff --git a/crates/ethers-core/src/types/mod.rs b/ethers-core/src/types/mod.rs similarity index 100% rename from crates/ethers-core/src/types/mod.rs rename to ethers-core/src/types/mod.rs diff --git a/crates/ethers-core/src/utils/ganache.rs b/ethers-core/src/utils/ganache.rs similarity index 100% rename from crates/ethers-core/src/utils/ganache.rs rename to ethers-core/src/utils/ganache.rs diff --git a/crates/ethers-core/src/utils/hash.rs b/ethers-core/src/utils/hash.rs similarity index 100% rename from crates/ethers-core/src/utils/hash.rs rename to ethers-core/src/utils/hash.rs diff --git a/crates/ethers-core/src/utils/mod.rs b/ethers-core/src/utils/mod.rs similarity index 100% rename from crates/ethers-core/src/utils/mod.rs rename to ethers-core/src/utils/mod.rs diff --git a/crates/ethers-core/src/utils/solc.rs b/ethers-core/src/utils/solc.rs similarity index 100% rename from crates/ethers-core/src/utils/solc.rs rename to ethers-core/src/utils/solc.rs diff --git a/crates/ethers-providers/Cargo.toml b/ethers-providers/Cargo.toml similarity index 100% rename from crates/ethers-providers/Cargo.toml rename to ethers-providers/Cargo.toml diff --git a/crates/ethers-providers/src/ens.rs b/ethers-providers/src/ens.rs similarity index 100% rename from crates/ethers-providers/src/ens.rs rename to ethers-providers/src/ens.rs diff --git a/crates/ethers-providers/src/http.rs b/ethers-providers/src/http.rs similarity index 100% rename from crates/ethers-providers/src/http.rs rename to ethers-providers/src/http.rs diff --git a/crates/ethers-providers/src/lib.rs b/ethers-providers/src/lib.rs similarity index 100% rename from crates/ethers-providers/src/lib.rs rename to ethers-providers/src/lib.rs diff --git a/crates/ethers-providers/src/networks.rs b/ethers-providers/src/networks.rs similarity index 100% rename from crates/ethers-providers/src/networks.rs rename to ethers-providers/src/networks.rs diff --git a/crates/ethers-providers/src/provider.rs b/ethers-providers/src/provider.rs similarity index 100% rename from crates/ethers-providers/src/provider.rs rename to ethers-providers/src/provider.rs diff --git a/crates/ethers-signers/Cargo.toml b/ethers-signers/Cargo.toml similarity index 100% rename from crates/ethers-signers/Cargo.toml rename to ethers-signers/Cargo.toml diff --git a/crates/ethers-signers/src/client.rs b/ethers-signers/src/client.rs similarity index 100% rename from crates/ethers-signers/src/client.rs rename to ethers-signers/src/client.rs diff --git a/crates/ethers-signers/src/lib.rs b/ethers-signers/src/lib.rs similarity index 100% rename from crates/ethers-signers/src/lib.rs rename to ethers-signers/src/lib.rs diff --git a/crates/ethers-signers/src/wallet.rs b/ethers-signers/src/wallet.rs similarity index 100% rename from crates/ethers-signers/src/wallet.rs rename to ethers-signers/src/wallet.rs diff --git a/crates/ethers/Cargo.toml b/ethers/Cargo.toml similarity index 100% rename from crates/ethers/Cargo.toml rename to ethers/Cargo.toml diff --git a/crates/ethers/examples/contract.rs b/ethers/examples/contract.rs similarity index 100% rename from crates/ethers/examples/contract.rs rename to ethers/examples/contract.rs diff --git a/crates/ethers/examples/contract.sol b/ethers/examples/contract.sol similarity index 100% rename from crates/ethers/examples/contract.sol rename to ethers/examples/contract.sol diff --git a/crates/ethers/examples/ens.rs b/ethers/examples/ens.rs similarity index 100% rename from crates/ethers/examples/ens.rs rename to ethers/examples/ens.rs diff --git a/crates/ethers/examples/get_logs.rs b/ethers/examples/get_logs.rs similarity index 100% rename from crates/ethers/examples/get_logs.rs rename to ethers/examples/get_logs.rs diff --git a/crates/ethers/examples/local_signer.rs b/ethers/examples/local_signer.rs similarity index 100% rename from crates/ethers/examples/local_signer.rs rename to ethers/examples/local_signer.rs diff --git a/crates/ethers/examples/sign.rs b/ethers/examples/sign.rs similarity index 100% rename from crates/ethers/examples/sign.rs rename to ethers/examples/sign.rs diff --git a/crates/ethers/examples/transfer_eth.rs b/ethers/examples/transfer_eth.rs similarity index 100% rename from crates/ethers/examples/transfer_eth.rs rename to ethers/examples/transfer_eth.rs diff --git a/crates/ethers/src/lib.rs b/ethers/src/lib.rs similarity index 100% rename from crates/ethers/src/lib.rs rename to ethers/src/lib.rs