datasource/ethereum: Move to chain/ethereum, rename crate

We'll be adding multi-blockchain in the not too distant future and we have discussed using more clearly separated terminology for the different components of The Graph. We'll be calling different technologies like Ethereum, Cosmos etc. "chains" and their specific instances (like Ethereum mainnet, Kovan, POA) "networks".
davidkngo · Nov 20, 2019 · 1959990 · 1959990
1 parent 1600b21
commit 1959990
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "core",
-    "datasource/ethereum",
+    "chain/ethereum",
     "graphql",
     "mock",
     "node",

diff --git a/README.md b/README.md
@@ -122,7 +122,7 @@ the environment variables that can be configured.
   common data.
 - `core` — A library providing implementations for core components, used by all
   nodes.
-- `datasource/ethereum` — A library with components for obtaining data from
+- `chain/ethereum` — A library with components for obtaining data from
   Ethereum.
 - `graphql` — A GraphQL implementation with API schema generation,
   introspection, and more.

diff --git a/datasource/ethereum/Cargo.toml → chain/ethereum/Cargo.toml b/datasource/ethereum/Cargo.toml → chain/ethereum/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "graph-datasource-ethereum"
+name = "graph-chain-ethereum"
 version = "0.16.1"
 edition = "2018"
 

diff --git a/datasource/ethereum/src/block_ingestor.rs → chain/ethereum/src/block_ingestor.rs b/datasource/ethereum/src/block_ingestor.rs → chain/ethereum/src/block_ingestor.rs
diff --git a/datasource/ethereum/src/block_stream.rs → chain/ethereum/src/block_stream.rs b/datasource/ethereum/src/block_stream.rs → chain/ethereum/src/block_stream.rs
diff --git a/datasource/ethereum/src/ethereum_adapter.rs → chain/ethereum/src/ethereum_adapter.rs b/datasource/ethereum/src/ethereum_adapter.rs → chain/ethereum/src/ethereum_adapter.rs
diff --git a/datasource/ethereum/src/lib.rs → chain/ethereum/src/lib.rs b/datasource/ethereum/src/lib.rs → chain/ethereum/src/lib.rs
diff --git a/datasource/ethereum/src/transport.rs → chain/ethereum/src/transport.rs b/datasource/ethereum/src/transport.rs → chain/ethereum/src/transport.rs
diff --git a/datasource/ethereum/tests/adapter.rs → chain/ethereum/tests/adapter.rs b/datasource/ethereum/tests/adapter.rs → chain/ethereum/tests/adapter.rs
@@ -9,7 +9,7 @@ use ethabi::{Function, Param, ParamType, Token};
 use graph::components::ethereum::EthereumContractCall;
 use graph::prelude::EthereumAdapter as EthereumAdapterTrait;
 use graph::prelude::*;
-use graph_datasource_ethereum::EthereumAdapter;
+use graph_chain_ethereum::EthereumAdapter;
 use mock::MockMetricsRegistry;
 use web3::helpers::*;
 use web3::types::*;

diff --git a/graph/src/log/elastic.rs b/graph/src/log/elastic.rs
@@ -156,7 +156,7 @@ pub struct ElasticDrainConfig {
 ///     "timestamp": "2018-11-08T00:54:52.589258000Z",
 ///     "subgraphId": "Qmb31zcpzqga7ERaUTp83gVdYcuBasz4rXUHFufikFTJGU",
 ///     "meta": {
-///       "module": "graph_datasource_ethereum::block_stream",
+///       "module": "graph_chain_ethereum::block_stream",
 ///       "line": 220,
 ///       "column": 9
 ///     },

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -21,7 +21,7 @@ url = "1.7.1"
 crossbeam-channel = "0.3.9"
 graph = { path = "../graph" }
 graph-core = { path = "../core" }
-graph-datasource-ethereum = { path = "../datasource/ethereum" }
+graph-chain-ethereum = { path = "../chain/ethereum" }
 graph-mock = { path = "../mock" }
 graph-runtime-wasm = { path = "../runtime/wasm" }
 graph-server-http = { path = "../server/http" }

diff --git a/node/src/main.rs b/node/src/main.rs
@@ -15,11 +15,11 @@ use graph::prelude::{
     EthereumAdapter as EthereumAdapterTrait, IndexNodeServer as _, JsonRpcServer as _, *,
 };
 use graph::util::security::SafeDisplay;
+use graph_chain_ethereum::{BlockIngestor, BlockStreamBuilder, Transport};
 use graph_core::{
     LinkResolver, MetricsRegistry, SubgraphAssignmentProvider as IpfsSubgraphAssignmentProvider,
     SubgraphInstanceManager, SubgraphRegistrar as IpfsSubgraphRegistrar,
 };
-use graph_datasource_ethereum::{BlockStreamBuilder, Transport};
 use graph_runtime_wasm::RuntimeHostBuilder as WASMRuntimeHostBuilder;
 use graph_server_http::GraphQLServer as GraphQLQueryServer;
 use graph_server_index_node::IndexNodeServer;
@@ -563,7 +563,7 @@ fn async_main() -> impl Future<Item = (), Error = ()> + Send + 'static {
 
             // Create Ethereum block ingestors and spawn a thread to run each
             eth_adapters.iter().for_each(|(network_name, eth_adapter)| {
-                let block_ingestor = graph_datasource_ethereum::BlockIngestor::new(
+                let block_ingestor = BlockIngestor::new(
                     stores.get(network_name).expect("network with name").clone(),
                     eth_adapter.clone(),
                     *ANCESTOR_COUNT,
@@ -797,7 +797,7 @@ fn parse_ethereum_networks_and_nodes(
 
                 Ok((
                     name.to_string(),
-                    Arc::new(graph_datasource_ethereum::EthereumAdapter::new(
+                    Arc::new(graph_chain_ethereum::EthereumAdapter::new(
                         transport,
                         eth_rpc_metrics.clone(),
                     )) as Arc<dyn EthereumAdapter>,