graph, test-store: Small improvements

* Do not arbitrarily truncate subgraph names to 32 characters; that can
  lead to strange surprises when the names of two test subgraphs only
  differ after the 32nd character
* Use a more direct method to get rid of test subgraphs. Using
  `record_unused_deployments` is a bit too roundabout for tests, and can
  lead to not deleting a subgraph if a previous run recorded the subgraph
  as unused, but didn't delete it

Author: lutter

graph/src/data/subgraph/mod.rs

@@ -218,6 +218,12 @@ impl SubgraphName {
         Ok(SubgraphName(s))
     }
 
+    /// Tests are allowed to create arbitrary subgraph names
+    #[cfg(debug_assertions)]
+    pub fn new_unchecked(s: impl Into<String>) -> Self {
+        SubgraphName(s.into())
+    }
+
     pub fn as_str(&self) -> &str {
         self.0.as_str()
     }

store/test-store/src/store.rs

@@ -170,11 +170,7 @@ pub async fn create_subgraph(
     yaml.insert("dataSources".into(), Vec::<serde_yaml::Value>::new().into());
     let yaml = serde_yaml::to_string(&yaml).unwrap();
     let deployment = DeploymentCreate::new(yaml, &manifest, None).graft(base);
-    let name = {
-        let mut name = subgraph_id.to_string();
-        name.truncate(32);
-        SubgraphName::new(name).unwrap()
-    };
+    let name = SubgraphName::new_unchecked(subgraph_id.to_string());
     let deployment = SUBGRAPH_STORE.create_deployment_replace(
         name,
         &schema,
@@ -198,14 +194,14 @@ pub async fn create_test_subgraph(subgraph_id: &DeploymentHash, schema: &str) ->
 }
 
 pub fn remove_subgraph(id: &DeploymentHash) {
-    let name = {
-        let mut name = id.to_string();
-        name.truncate(32);
-        SubgraphName::new(name).unwrap()
-    };
+    let name = SubgraphName::new_unchecked(id.to_string());
     SUBGRAPH_STORE.remove_subgraph(name).unwrap();
-    for detail in SUBGRAPH_STORE.record_unused_deployments().unwrap() {
-        SUBGRAPH_STORE.remove_deployment(detail.id).unwrap();
+    let locs = SUBGRAPH_STORE.locators(id.as_str()).unwrap();
+    let conn = primary_connection();
+    for loc in locs {
+        let site = conn.locate_site(loc.clone()).unwrap().unwrap();
+        conn.unassign_subgraph(&site).unwrap();
+        SUBGRAPH_STORE.remove_deployment(site.id).unwrap();
     }
 }