REMOVEME: revert

unionlabs · Oct 20, 2023 · 9aad8ad · 9aad8ad
1 parent 99651b8
commit 9aad8ad
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 150 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/voyager/Cargo.toml b/voyager/Cargo.toml
@@ -4,9 +4,6 @@ version = "0.1.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[profile.release]
-debug = true
-
 [dependencies]
 base64 = "0.21.0"
 bech32 = "0.9.1"
@@ -29,6 +26,7 @@ tonic = { version = "0.9", features = ["transport","tls","tls-roots","tls-webpki
 tower = { version = "*", features = ["log"] }
 clap = { version = "4.3.0", features = ["derive", "env", "error-context"] }
 tracing = "0.1.37"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 typenum = "1.16.0"
 serde = { version = "1.0.173", features = ["derive"] }
 hex = { version = "0.4.3", features = [ "serde" ] }
@@ -52,7 +50,6 @@ sqlx = { version = "0.7.2", features = ["postgres", "tls-rustls"] }
 thiserror = "1.0.49"
 crossbeam-queue = "0.3.8"
 derive_more = "0.99.17"
-console-subscriber = "0.2.0"
 
 tikv-jemallocator = { version = "0.5", features = [ "profiling" ] }
 

diff --git a/voyager/src/main.rs b/voyager/src/main.rs
@@ -41,7 +41,7 @@ pub mod chain;
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> ExitCode {
-    console_subscriber::init();
+    tracing_subscriber::fmt::init();
 
     let args = AppArgs::parse();
 

diff --git a/voyager/voyager.nix b/voyager/voyager.nix
@@ -3,7 +3,6 @@
     let
       mkVoyager = features: pnameSuffix: (crane.buildWorkspaceMember {
         inherit pnameSuffix;
-        rustflags = "--cfg tokio_unstable";
         crateDirFromRoot = "voyager";
         cargoBuildExtraArgs = features;
         additionalSrcFilter = path: _:
@@ -12,7 +11,6 @@
           pkgs.lib.hasPrefix "hubble/src/graphql" path;
         extraEnv = {
           SQLX_OFFLINE = "1";
-          doNotLinkInheritedArtifacts = true;
         };
       });