Stabilize diesel

Author: macladson

Cargo.lock

@@ -28,8 +28,8 @@ serde_json = "1.0.58"
 reqwest = { version = "0.11.0", features = ["json","stream"] }
 url = "2.2.2"
 rand = "0.7.3"
-diesel = { git = "https://github.com/diesel-rs/diesel", branch = "master", features = ["postgres", "r2d2"] }
-diesel_migrations = { git = "https://github.com/diesel-rs/diesel", branch = "master", features = ["postgres"] }
+diesel = { version = "2.0.2", features = ["postgres", "r2d2"] }
+diesel_migrations = { version = "2.0.0", features = ["postgres"] }
 byteorder = "1.4.3"
 bls = { path = "../crypto/bls" }
 hex = "0.4.2"

watch/Cargo.toml

@@ -1,3 +1,4 @@
+#![cfg(unix)]
 pub mod block_packing;
 pub mod block_rewards;
 pub mod blockprint;

watch/src/lib.rs

@@ -1,5 +1,3 @@
-#![cfg(unix)]
-
 use std::process;
 
 mod block_packing;
@@ -13,6 +11,7 @@ mod server;
 mod suboptimal_attestations;
 mod updater;
 
+#[cfg(unix)]
 #[tokio::main]
 async fn main() {
     match cli::run().await {
@@ -24,3 +23,6 @@ async fn main() {
         }
     }
 }
+
+#[cfg(windows)]
+fn main() {}

watch/src/main.rs

@@ -1,4 +1,5 @@
 #![recursion_limit = "256"]
+#![cfg(unix)]
 
 use beacon_chain::test_utils::{
     AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType,