Merge pull request #34 from aurora-is-near/test-add-logging

test: add logging

.github/workflows/test.yml

@@ -46,7 +46,11 @@ jobs:
           cp .env.example .env
           source .env
           export AURORA_PLUS_API_KEY=${{secrets.AURORA_PLUS_API_KEY}}
-          cargo test --no-fail-fast -- -Z unstable-options --format json --report-time | cargo2junit > results.xml
+          cargo test -- -Z unstable-options --format json --report-time 2> test.log | tee results.json
+          cat results.json | cargo2junit > results.xml
+
+      - name: Log
+        run: cat test.log
 
       - name: Upload results
         run: |

.github/workflows/tests_on_schedule.yml

@@ -37,7 +37,11 @@ jobs:
           cp .env.example .env
           source .env
           export AURORA_PLUS_API_KEY=${{secrets.AURORA_PLUS_API_KEY}}
-          cargo test --no-fail-fast -- -Z unstable-options --format json --report-time | cargo2junit > results.xml
+          cargo test -- -Z unstable-options --format json --report-time 2> test.log | tee results.json
+          cat results.json | cargo2junit > results.xml
+
+      - name: Log
+        run: cat test.log
 
       - name: Upload results
         run: |

.gitignore

@@ -13,4 +13,8 @@ Cargo.lock
 .idea/
 .env
 relayer-test-data-generator/
+
+# Generated artifacts from tests
+results.json
 results.xml
+test.log

dao/src/lib.rs

@@ -8,8 +8,8 @@ mod tests {
     use crate::dao::models::{get_db_connection, TestRun, TestTask};
     use crate::utils::utils::{get_env_var, get_full_db_path, load_env_file};
     use std::cmp::Ordering;
-    use tracing::{debug, Level};
-    use tracing_subscriber::FmtSubscriber;
+    // use tracing::{debug, Level};
+    // use tracing_subscriber::FmtSubscriber;
 
     #[test]
     fn it_loads_env_file() {
@@ -41,10 +41,10 @@ mod tests {
             .filter_tasks_with_limit_one(task_type.clone())
             .unwrap();
         assert_eq!(task.task_type, task_type);
-        debug!(
-            "{}, {}, {}, {}, {}",
-            task.db_id, task.task_type, task.parameters, task.begin, task.end
-        );
+        // debug!(
+        //     "{}, {}, {}, {}, {}",
+        //     task.db_id, task.task_type, task.parameters, task.begin, task.end
+        // );
         let data_contents: Vec<String> = task
             .get_test_data_content_array("receipt".to_string())
             .unwrap();
@@ -71,15 +71,15 @@ mod tests {
             .get_test_data_content_array("receipt".to_string())
             .unwrap();
         let number_of_data_contents = data_contents.len();
-        let subscriber = FmtSubscriber::builder()
-            .with_max_level(Level::TRACE)
-            .finish();
-        tracing::subscriber::set_global_default(subscriber)
-            .expect("setting default subscriber failed");
+        // let subscriber = FmtSubscriber::builder()
+        //     .with_max_level(Level::TRACE)
+        //     .finish();
+        // tracing::subscriber::set_global_default(subscriber)
+        //     .expect("setting default subscriber failed");
         // debug!("{}", data_contents[0]);
         let receipts = TransactionReceipt::load(data_contents).unwrap();
         // debug!("{:?}", receipts[0].events[0].args);
-        debug!("Number of receipts: {:?}", receipts.len());
+        // debug!("Number of receipts: {:?}", receipts.len());
         let number_of_receipts = receipts.len();
         let result = number_of_receipts.cmp(&0);
         assert_eq!(Ordering::Greater, result);

dao/src/utils.rs

@@ -5,6 +5,7 @@ pub mod utils {
 
     const MAINNET_AURORA_CHAIN_ID: i64 = 1313161554;
     const TESTNET_AURORA_CHAIN_ID: i64 = 1313161555;
+    const SEPOLIA_CHAIN_ID: i64 = 11155111;
     const ROPSTEN_CHAIN_ID: i64 = 3;
     const GOERLI_CHAIN_ID: i64 = 5;
 
@@ -32,6 +33,7 @@ pub mod utils {
 
     pub fn get_chain_id(network_name: &str) -> Option<i64> {
         match network_name {
+            "sepolia" => Some(SEPOLIA_CHAIN_ID),
             "ropsten" => Some(ROPSTEN_CHAIN_ID),
             "goerli" => Some(GOERLI_CHAIN_ID),
             "testnet_aurora_plus" => Some(TESTNET_AURORA_CHAIN_ID),
@@ -48,6 +50,7 @@ pub mod utils {
     pub fn get_client_version(network_name: &str) -> Option<String> {
         static AURORA_WEB3_CLIENT_VERSION: &str = "Aurora";
         match network_name {
+            "sepolia" => Some(AURORA_WEB3_CLIENT_VERSION.to_string()),
             "ropsten" => Some("erigon/2022.99.99/linux-amd64/go1.18.3".to_string()), // https://rpc.ankr.com/eth_ropsten
             "goerli" => Some("Geth/v1.10.23-omnibus-b38477ec/linux-amd64/go1.18.5".to_string()), // infura
             "testnet_aurora_plus" => Some(AURORA_WEB3_CLIENT_VERSION.to_string()),
@@ -63,6 +66,7 @@ pub mod utils {
 
     pub fn get_protocol_version(network: &str) -> Option<i32> {
         match network {
+            "sepolia" => Some(65),
             "ropsten" => Some(0), // this one is unknown!
             "goerli" => Some(65),
             "testnet_aurora_plus" => Some(65),         // 0x41

dynamic_apis_tests/Cargo.toml

@@ -7,7 +7,7 @@ authors.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dao = { path = "../dao", default-features = false}
+dao = { path = "../dao", default-features = false }
 anyhow.workspace = true
 jsonrpsee-http-client.workspace = true
 jsonrpsee-ws-client.workspace = true

dynamic_apis_tests/tests/it/common/mod.rs

@@ -0,0 +1,11 @@
+use tracing::subscriber::DefaultGuard;
+
+pub fn init() -> DefaultGuard {
+    // Build a subscriber with the non-blocking file appender
+    let subscriber = tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::INFO)
+        // .with_writer(non_blocking)
+        .with_writer(std::io::stderr)
+        .finish();
+    tracing::subscriber::set_default(subscriber)
+}

dynamic_apis_tests/tests/it/eth_accounts.rs

@@ -1,17 +1,14 @@
 use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_accounts() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let params = rpc_params![];
     let client = http_client::HttpClientBuilder::default().build(configs.rpc_url)?;

dynamic_apis_tests/tests/it/eth_block_number.rs

@@ -5,13 +5,14 @@ use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
 use std::cmp::Ordering;
 use std::i64;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_block_number() -> anyhow::Result<()> {
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();
     let task: TestTask = test_run
@@ -22,10 +23,6 @@ async fn test_eth_block_number() -> anyhow::Result<()> {
         .unwrap();
     let receipts = TransactionReceipt::load(data_contents).unwrap();
     let client = http_client::HttpClientBuilder::default().build(configs.rpc_url)?;
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
     for i in 0..receipts.len() {
         let params = rpc_params![];
         let response: Result<String, _> = client.request("eth_blockNumber", params).await;

dynamic_apis_tests/tests/it/eth_call.rs

@@ -3,9 +3,9 @@ use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
 use serde::{Deserialize, Serialize};
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -22,10 +22,7 @@ impl MessageCallParams {
 
 #[tokio::test]
 async fn test_eth_call() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();
     let task: TestTask = test_run
@@ -49,10 +46,7 @@ async fn test_eth_call() -> anyhow::Result<()> {
 
 #[tokio::test]
 async fn test_eth_call_eoa() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     info!("calling precompile SHA256 from EOA");
     let configs = Configs::load().unwrap();
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();

dynamic_apis_tests/tests/it/eth_chain_id.rs

@@ -3,17 +3,14 @@ use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
 use std::cmp::Ordering;
 use std::i64;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_chain_id() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let client = http_client::HttpClientBuilder::default().build(configs.rpc_url)?;
     let params = rpc_params![];

dynamic_apis_tests/tests/it/eth_coinbase.rs

@@ -1,17 +1,14 @@
 use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_coinbase() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let params = rpc_params![];
     let client = http_client::HttpClientBuilder::default().build(configs.rpc_url.clone())?;

dynamic_apis_tests/tests/it/eth_estimate_gas.rs

@@ -5,9 +5,9 @@ use jsonrpsee_http_client as http_client;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::i64;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -29,10 +29,7 @@ impl MessageCallParams {
 
 #[tokio::test]
 async fn test_eth_estimate_gas() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();
     let task: TestTask = test_run

dynamic_apis_tests/tests/it/eth_gas_price.rs

@@ -4,19 +4,16 @@ use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
 use std::cmp::Ordering;
 use std::i64;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 use crate::utils::hex_string_to_i64;
 
 #[tokio::test]
 async fn test_eth_gas_price() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let client_aurora_plus = http_client::HttpClientBuilder::default().build(configs.rpc_url)?;
     let aurora_rpc_url = format!("{}", get_env_var(&"RPC_URL".to_string()).unwrap());

dynamic_apis_tests/tests/it/eth_get_balance.rs

@@ -4,17 +4,14 @@ use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
 use std::i64;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_get_balance() -> anyhow::Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    let _guard = init();
     let configs = Configs::load().unwrap();
     let client = http_client::HttpClientBuilder::default().build(configs.rpc_url)?;
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();

dynamic_apis_tests/tests/it/eth_get_block_by_hash.rs

@@ -3,18 +3,15 @@ use dao::dao::models::{TestRun, TestTask};
 use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_get_block_by_hash() -> anyhow::Result<()> {
+    let _guard = init();
     let configs = Configs::load().unwrap();
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();
     let task: TestTask = test_run
         .filter_tasks_with_limit_one("transferNtimes".to_string())

dynamic_apis_tests/tests/it/eth_get_block_by_number.rs

@@ -3,18 +3,15 @@ use dao::dao::models::{TestRun, TestTask};
 use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_get_block_by_number() -> anyhow::Result<()> {
+    let _guard = init();
     let configs = Configs::load().unwrap();
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();
     let task: TestTask = test_run
         .filter_tasks_with_limit_one("transferNtimes".to_string())

dynamic_apis_tests/tests/it/eth_get_block_transaction_count_by_hash.rs

@@ -6,18 +6,15 @@ use jsonrpsee_core::rpc_params;
 use jsonrpsee_http_client as http_client;
 use std::cmp::Ordering;
 use std::i64;
-use tracing::{info, Level};
-use tracing_subscriber::FmtSubscriber;
+use tracing::info;
 
+use crate::common::init;
 use crate::configs::Configs;
 
 #[tokio::test]
 async fn test_eth_get_block_transaction_count_by_hash() -> anyhow::Result<()> {
+    let _guard = init();
     let configs = Configs::load().unwrap();
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
     let test_run = TestRun::new(&configs.conn, configs.network).unwrap();
     let task: TestTask = test_run
         .filter_tasks_with_limit_one("transferNtimes".to_string())