Skip to content

Commit

Permalink
remove tracing
Browse files Browse the repository at this point in the history
  • Loading branch information
error2215 committed Feb 2, 2024
1 parent cd8752b commit 9ae65d4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion shuttle/src/server/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! Contains the code to launch an ethereum RPC-Server
use crate::EthApi;
use shuttle_server::{ipc::IpcEndpoint, AnvilServer, ServerConfig};
use futures::StreamExt;
use handler::{HttpEthRpcHandler, PubSubEthRpcHandler};
use shuttle_server::{ipc::IpcEndpoint, AnvilServer, ServerConfig};
use std::net::SocketAddr;
use tokio::{io, task::JoinHandle};
use tracing::trace;
Expand Down
5 changes: 1 addition & 4 deletions spark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@ serde = "1"
serde_json = "1"
tokio = { version = "1", features = ["time"] }
tracing = "0.1"
tracing-subscriber = "0.3"
yansi = "0.5"
tracing-subscriber = {version = "0.3", features = ["env-filter"]}

[dev-dependencies]
corebc = { workspace = true, features = ["ylem-full", "ylem-tests", "rustls"]}
foxar-utils = { path = "./../utils" }

[profile.test] # fixed
opt-level = 4
4 changes: 2 additions & 2 deletions spark/tests/it/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ impl TestConfig {
}
for (_, SuiteResult { test_results, .. }) in suite_result {
for (test_name, result) in test_results {
if self.should_fail && (result.status == TestStatus::Success)
|| !self.should_fail && (result.status == TestStatus::Failure)
if self.should_fail && (result.status == TestStatus::Success) ||
!self.should_fail && (result.status == TestStatus::Failure)
{
let logs = decode_console_logs(&result.logs);
let outcome = if self.should_fail { "fail" } else { "pass" };
Expand Down
7 changes: 0 additions & 7 deletions spark/tests/it/invariant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ use crate::{config::*, test_helpers::filter::Filter};
use corebc::types::U256;
use spark::fuzz::CounterExample;
use std::collections::BTreeMap;
use tracing::level_filters::LevelFilter;
use tracing_subscriber::EnvFilter;

#[tokio::test(flavor = "multi_thread")]
async fn test_invariant() {
Expand Down Expand Up @@ -113,11 +111,6 @@ async fn test_invariant_override() {

#[tokio::test(flavor = "multi_thread")]
async fn test_invariant_storage() {
// let filter =
// EnvFilter::builder().with_default_directive(LevelFilter::TRACE.into()).from_env().unwrap();

// tracing_subscriber::fmt().with_env_filter(filter).compact().init();

let mut runner = runner().await;

let mut opts = test_opts();
Expand Down
8 changes: 4 additions & 4 deletions utils/src/abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ fn format_function_output_param(
fn format_param(param: &Param, kind: String) -> String {
// add `memory` if required (not needed for events, only for functions)
let is_memory = match param.kind {
ParamType::Array(_)
| ParamType::Bytes
| ParamType::String
| ParamType::FixedArray(_, _) => true,
ParamType::Array(_) |
ParamType::Bytes |
ParamType::String |
ParamType::FixedArray(_, _) => true,
ParamType::Tuple(_) => param.internal_type.is_some(),
_ => false,
};
Expand Down

0 comments on commit 9ae65d4

Please sign in to comment.