graph, store: Move the entity_cache test to test-store

lutter · lutter · commit bd4f6fb28f64 · 2023-03-31T16:29:28.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
@@ -66,9 +66,6 @@ web3 = { git = "https://github.com/graphprotocol/rust-web3", branch = "graph-pat
 serde_plain = "1.0.1"
 
 [dev-dependencies]
-test-store = { path = "../store/test-store" }
-graph-store-postgres = { path = "../store/postgres" }
-graph-chain-ethereum = { path = "../chain/ethereum" }
 clap = { version = "3.2.23", features = ["derive", "env"] }
 maplit = "1.0.2"
 hex-literal = "0.3"
diff --git a/graph/tests/README.md b/graph/tests/README.md
@@ -0,0 +1,5 @@
+Put integration tests for this crate into `store/test-store/tests/graph`.
+This avoids cyclic dev-dependencies which make rust-analyzer nearly
+unusable. Once [this
+issue](https://github.com/rust-lang/rust-analyzer/issues/14167) has been
+fixed, we can move tests back here
diff --git a/store/test-store/tests/graph.rs b/store/test-store/tests/graph.rs
@@ -0,0 +1,3 @@
+pub mod graph {
+    pub mod entity_cache;
+}
diff --git a/store/test-store/tests/graph/entity_cache.rs b/store/test-store/tests/graph/entity_cache.rs
@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use graph::blockchain::block_stream::FirehoseCursor;
 use graph::components::store::{
     DeploymentCursorTracker, DerivedEntityQuery, EntityKey, EntityType, LoadRelatedRequest,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use async_trait::async_trait;`
`2`	`1`	`use graph::blockchain::block_stream::FirehoseCursor;`
`3`	`2`	`use graph::components::store::{`
`4`	`3`	`DeploymentCursorTracker, DerivedEntityQuery, EntityKey, EntityType, LoadRelatedRequest,`