feat: add rustfmt

rustfmt.toml

@@ -0,0 +1,3 @@
+group_imports = "StdExternalCrate"
+imports_granularity = "Preserve"
+reorder_imports = true

src/config.rs

@@ -1,12 +1,11 @@
 use std::str::FromStr;
 
 use anyhow::Result;
-use dotenv::dotenv;
-
 use aptos_sdk::move_types::account_address::AccountAddress;
 use aptos_sdk::rest_client::Client;
 use aptos_sdk::types::chain_id::ChainId;
 use aptos_sdk::types::LocalAccount;
+use dotenv::dotenv;
 
 pub struct EnvConfig {
     pub node_url: String,

src/contracts_caller/memory_page_fact_registry/mod.rs

@@ -1,4 +1,4 @@
-pub mod register_continuous_memorypage;
+pub mod register_continuous_memory_page;
 pub mod register_continuous_page_batch;
 pub mod sample_register_memory;
 pub mod types;

src/contracts_caller/memory_page_fact_registry/register_continuous_memorypage.rs → src/contracts_caller/memory_page_fact_registry/register_continuous_memory_page.rs

@@ -1,17 +1,19 @@
-use crate::config::AppConfig;
-use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_memorypage::ContinuousMemorypage;
-use crate::contracts_caller::transaction_helper::build_transaction;
+use std::str::FromStr;
+
 use aptos_sdk::move_types::identifier::Identifier;
 use aptos_sdk::move_types::language_storage::ModuleId;
 use aptos_sdk::move_types::u256::U256;
 use aptos_sdk::move_types::value::{serialize_values, MoveValue};
 use aptos_sdk::types::transaction::{EntryFunction, TransactionPayload};
 use log::info;
-use std::str::FromStr;
 
-pub async fn register_continuous_memorypage(
+use crate::config::AppConfig;
+use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_memory_page::ContinuousMemoryPage;
+use crate::contracts_caller::transaction_helper::build_transaction;
+
+pub async fn register_continuous_memory_page(
     config: &AppConfig,
-    data: ContinuousMemorypage,
+    data: ContinuousMemoryPage,
 ) -> anyhow::Result<bool> {
     let mut values = vec![];
     for e in &data.values {
@@ -37,7 +39,7 @@ pub async fn register_continuous_memorypage(
     let transaction = config.client.submit_and_wait(&tx).await?.into_inner();
     let transaction_info = transaction.transaction_info()?;
     info!(
-        "register_continuous_memorypage: {}; gas used: {}",
+        "register_continuous_memory_page: {}; gas used: {}",
         transaction_info.hash.to_string(),
         transaction_info.gas_used
     );

src/contracts_caller/memory_page_fact_registry/register_continuous_page_batch.rs

@@ -1,14 +1,16 @@
-use crate::config::AppConfig;
-use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_page_batch::MemoryPageEntries;
-use crate::contracts_caller::transaction_helper::build_transaction;
+use std::str::FromStr;
+
 use aptos_sdk::move_types::identifier::Identifier;
 use aptos_sdk::move_types::language_storage::ModuleId;
 use aptos_sdk::move_types::u256::U256;
 use aptos_sdk::move_types::value::{serialize_values, MoveValue};
 use aptos_sdk::types::transaction::{EntryFunction, TransactionPayload};
 use itertools::Itertools;
 use log::info;
-use std::str::FromStr;
+
+use crate::config::AppConfig;
+use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_page_batch::MemoryPageEntries;
+use crate::contracts_caller::transaction_helper::build_transaction;
 
 pub async fn register_continuous_page_batch(
     config: &AppConfig,
@@ -77,24 +79,14 @@ pub async fn register_continuous_page_batch(
             };
             let transaction_info = transaction.transaction_info()?;
             info!(
-                "register_continuous_memorypage_batch: {}; gas used: {}",
+                "register_continuous_memory_page_batch: {}; gas used: {}",
                 transaction_info.hash.to_string(),
                 transaction_info.gas_used
             );
-
-            if !transaction.success() {
-                success = false;
-                new_remaining_data.extend(chunk);
-                break;
-            }
         }
 
-        if success {
-            break;
-        } else {
-            remaining_data = new_remaining_data;
-            chunk_size /= 2;
-        }
+        remaining_data = new_remaining_data;
+        chunk_size /= 2;
     }
     Ok(success)
 }

src/contracts_caller/memory_page_fact_registry/sample_register_memory.rs

@@ -1,34 +1,23 @@
-use std::fs::File;
-use std::io::BufReader;
-
-use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_memorypage::ContinuousMemorypage;
+use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_memory_page::ContinuousMemoryPage;
 use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_page_batch::MemoryPageEntries;
 
 pub fn sample_register_continuous_page_batch() -> anyhow::Result<MemoryPageEntries> {
-    let file_path =
-        "src/data_samples/memory_page_fact_registry/register_continuous_page_batch.json"
-            .to_string();
-    let input_file = File::open(file_path)?;
-    let reader = BufReader::new(input_file);
-    let memory_page_entries: MemoryPageEntries = serde_json::from_reader(reader)?;
+    let byte = include_bytes!(
+        "../../data_samples/memory_page_fact_registry/register_continuous_page_batch.json"
+    );
+    let memory_page_entries: MemoryPageEntries = serde_json::from_slice(byte)?;
     Ok(memory_page_entries)
 }
 
-pub fn sample_register_continuous_page() -> anyhow::Result<ContinuousMemorypage> {
-    let file_path =
-        "src/data_samples/memory_page_fact_registry/register_memory_page.json".to_string();
-    let input_file = File::open(file_path)?;
-    let reader = BufReader::new(input_file);
-    let continuous_memmory_page: ContinuousMemorypage = serde_json::from_reader(reader)?;
-    Ok(continuous_memmory_page)
+pub fn sample_register_continuous_page() -> anyhow::Result<ContinuousMemoryPage> {
+    let byte =
+        include_bytes!("../../data_samples/memory_page_fact_registry/register_memory_page.json");
+    let continuous_memory_page: ContinuousMemoryPage = serde_json::from_slice(byte)?;
+    Ok(continuous_memory_page)
 }
 
 pub fn sample_large_data_register_continuous_page_batch() -> anyhow::Result<MemoryPageEntries> {
-    let file_path =
-        "src/data_samples/memory_page_fact_registry/large_data_register_continuous_page_batch.json"
-            .to_string();
-    let input_file = File::open(file_path)?;
-    let reader = BufReader::new(input_file);
-    let memory_page_entries: MemoryPageEntries = serde_json::from_reader(reader)?;
+    let byte = include_bytes!("../../data_samples/memory_page_fact_registry/large_data_register_continuous_page_batch.json");
+    let memory_page_entries: MemoryPageEntries = serde_json::from_slice(byte)?;
     Ok(memory_page_entries)
 }

src/contracts_caller/memory_page_fact_registry/types/mod.rs

@@ -1,2 +1,2 @@
-pub mod register_continuous_memorypage;
+pub mod register_continuous_memory_page;
 pub mod register_continuous_page_batch;

src/contracts_caller/memory_page_fact_registry/types/register_continuous_memorypage.rs → src/contracts_caller/memory_page_fact_registry/types/register_continuous_memory_page.rs

@@ -2,7 +2,7 @@ use serde::Deserialize;
 
 #[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
-pub struct ContinuousMemorypage {
+pub struct ContinuousMemoryPage {
     pub start_addr: String,
     pub values: Vec<String>,
     pub z: String,

src/contracts_caller/memory_page_fact_registry/types/register_continuous_page_batch.rs

@@ -1,8 +1,9 @@
-use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_memorypage::ContinuousMemorypage;
 use serde::Deserialize;
 
+use crate::contracts_caller::memory_page_fact_registry::types::register_continuous_memory_page::ContinuousMemoryPage;
+
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MemoryPageEntries {
-    pub memory_page_entries: Vec<ContinuousMemorypage>,
+    pub memory_page_entries: Vec<ContinuousMemoryPage>,
 }

tests/flow_test.rs

@@ -6,7 +6,6 @@ mod tests {
     use aptos_testcontainer::test_utils::aptos_container_test_utils::{lazy_aptos_container, run};
     use log::info;
     use test_log::test;
-
     use verifier_onchain_services::config::{AppConfig, EnvConfig};
     use verifier_onchain_services::contracts_caller::verify_fri::sample_verify_fri_input::sample_verify_fri_input;
     use verifier_onchain_services::contracts_caller::verify_fri::verify_fri::verify_fri;

tests/memory_page_test.rs

@@ -7,7 +7,7 @@ mod tests {
     use test_log::test;
 
     use verifier_onchain_services::config::{AppConfig, EnvConfig};
-    use verifier_onchain_services::contracts_caller::memory_page_fact_registry::register_continuous_memorypage::register_continuous_memorypage;
+    use verifier_onchain_services::contracts_caller::memory_page_fact_registry::register_continuous_memory_page::register_continuous_memory_page;
     use verifier_onchain_services::contracts_caller::memory_page_fact_registry::register_continuous_page_batch::register_continuous_page_batch;
     use verifier_onchain_services::contracts_caller::memory_page_fact_registry::sample_register_memory::{sample_large_data_register_continuous_page_batch, sample_register_continuous_page, sample_register_continuous_page_batch};
 
@@ -58,7 +58,7 @@ mod tests {
                     .await?;
 
                 let register_continuous_page_input = sample_register_continuous_page()?;
-                register_continuous_memorypage(&config, register_continuous_page_input).await?;
+                register_continuous_memory_page(&config, register_continuous_page_input).await?;
 
                 let large_data_register_continuous_page_batch_input =
                     sample_large_data_register_continuous_page_batch()?;