graph, node: Move serde_regex and toml into graph

Author: lutter

Cargo.lock

@@ -33,6 +33,7 @@ semver = { version = "1.0.16", features = ["serde"] }
 serde = { version = "1.0.126", features = ["rc"] }
 serde_derive = "1.0.125"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
+serde_regex = "1.1.0"
 serde_yaml = "0.9.21"
 slog = { version = "2.7.0", features = ["release_max_level_trace", "max_level_trace"] }
 stable-hash_legacy = { version = "0.3.3", package = "stable-hash" }
@@ -47,6 +48,7 @@ tiny-keccak = "1.5.0"
 tokio = { version = "1.28.1", features = ["time", "sync", "macros", "test-util", "rt-multi-thread", "parking_lot"] }
 tokio-stream = { version = "0.1.14", features = ["sync"] }
 tokio-retry = "0.3.0"
+toml = "0.7.4"
 url = "2.3.1"
 prometheus = "0.13.3"
 priority-queue = "0.7.0"

graph/Cargo.toml

@@ -89,6 +89,7 @@ pub mod prelude {
     pub use serde;
     pub use serde_derive::{Deserialize, Serialize};
     pub use serde_json;
+    pub use serde_regex;
     pub use serde_yaml;
     pub use slog::{self, crit, debug, error, info, o, trace, warn, Logger};
     pub use std::convert::TryFrom;
@@ -100,6 +101,7 @@ pub mod prelude {
     pub use thiserror;
     pub use tiny_keccak;
     pub use tokio;
+    pub use toml;
     pub use tonic;
     pub use web3;
 

graph/src/lib.rs

@@ -36,8 +36,6 @@ graph-server-websocket = { path = "../server/websocket" }
 graph-server-metrics = { path = "../server/metrics" }
 graph-store-postgres = { path = "../store/postgres" }
 serde = { version = "1.0.126", features = ["derive", "rc"] }
-serde_regex = "1.1.0"
-toml = "0.7.1"
 shellexpand = "3.1.0"
 termcolor = "1.2.0"
 diesel = "1.4.8"

node/Cargo.toml

@@ -10,7 +10,7 @@ use graph::{
             de::{self, value, SeqAccess, Visitor},
             Deserialize, Deserializer, Serialize,
         },
-        serde_json, Logger, NodeId, StoreError,
+        serde_json, serde_regex, toml, Logger, NodeId, StoreError,
     },
 };
 use graph_chain_ethereum::{self as ethereum, NodeCapabilities};
@@ -1155,7 +1155,7 @@ mod tests {
     use graph::blockchain::BlockchainKind;
     use graph::firehose::SubgraphLimit;
     use graph::prelude::regex::Regex;
-    use graph::prelude::NodeId;
+    use graph::prelude::{toml, NodeId};
     use http::{HeaderMap, HeaderValue};
     use std::collections::BTreeSet;
     use std::fs::read_to_string;
@@ -1460,7 +1460,7 @@ mod tests {
                 details = { type = "firehose", url = "http://localhost:9000" }
                 match = [
                   { name = "some_node_.*", limit = 10 },
-                  { name = "other_node_.*", limit = 0 } ] 
+                  { name = "other_node_.*", limit = 0 } ]
             "#,
         )
         .unwrap();
@@ -1498,7 +1498,7 @@ mod tests {
                 details = { type = "substreams", url = "http://localhost:9000" }
                 match = [
                   { name = "some_node_.*", limit = 101 },
-                  { name = "other_node_.*", limit = 0 } ] 
+                  { name = "other_node_.*", limit = 0 } ]
             "#,
         )
         .unwrap();
@@ -1536,7 +1536,7 @@ mod tests {
                 details = { type = "substreams", url = "http://localhost:9000" }
                 match = [
                   { name = "some_node_.*", limit = 10 },
-                  { name = "other_node_.*", limit = 0 } ] 
+                  { name = "other_node_.*", limit = 0 } ]
             "#,
         )
         .unwrap();
@@ -1574,7 +1574,7 @@ mod tests {
                 details = { type = "substreams", url = "http://localhost:9000" }
                 match = [
                   { name = "some_node_.*", limit = 101 },
-                  { name = "other_node_.*", limit = 0 } ] 
+                  { name = "other_node_.*", limit = 0 } ]
             "#,
         )
         .unwrap();

node/src/config.rs

@@ -973,7 +973,7 @@ mod data {
                     use public::eth_call_meta as meta;
 
                     cache::table
-                        .find(id.as_ref())
+                        .find::<&[u8]>(id.as_ref())
                         .inner_join(meta::table)
                         .select((
                             cache::return_value,
@@ -1101,7 +1101,7 @@ mod data {
                 Storage::Shared => {
                     use public::eth_call_meta as meta;
 
-                    update(meta::table.find(contract_address.as_ref()))
+                    update(meta::table.find::<&[u8]>(contract_address.as_ref()))
                         .set(meta::accessed_at.eq(sql("CURRENT_DATE")))
                         .execute(conn)
                 }