cleanup

Author: jayantk

apps/fortuna/src/chain/ethereum.rs

@@ -102,12 +102,8 @@ impl<T: JsonRpcClient + 'static + Clone> SignablePythContractInner<T> {
         provider: &Address,
         user_randomness: &[u8; 32],
     ) -> Result<u64> {
-        println!("1");
-
         let fee = self.get_fee(*provider).call().await?;
 
-        println!("2");
-
         let hashed_randomness: [u8; 32] = Keccak256::digest(user_randomness).into();
 
         if let Some(r) = self
@@ -117,10 +113,11 @@ impl<T: JsonRpcClient + 'static + Clone> SignablePythContractInner<T> {
             .await?
             .await?
         {
-            println!("3");
             // Extract Log from TransactionReceipt.
             let l: RawLog = r.logs[0].clone().into();
-            if let PythRandomEvents::RequestedFilter(r) = PythRandomEvents::decode_log(&l)? {
+            if let PythRandomEvents::RequestedWithCallbackFilter(r) =
+                PythRandomEvents::decode_log(&l)?
+            {
                 Ok(r.request.sequence_number)
             } else {
                 Err(anyhow!("No log with sequence number"))

apps/fortuna/src/command/generate.rs

@@ -1,8 +1,12 @@
 use {
     crate::{
-        chain::ethereum::{SignablePythContract, RevealedWithCallbackFilter},
+        chain::ethereum::{RevealedWithCallbackFilter, SignablePythContract},
         config::{Config, GenerateOptions},
-    }, anyhow::Result, base64::{engine::general_purpose::STANDARD as base64_standard_engine, Engine as _}, ethers::providers::Middleware, std::sync::Arc,
+    },
+    anyhow::Result,
+    base64::{engine::general_purpose::STANDARD as base64_standard_engine, Engine as _},
+    ethers::providers::Middleware,
+    std::sync::Arc,
     tokio::time::{self, Duration},
 };
 
@@ -19,19 +23,19 @@ pub async fn generate(opts: &GenerateOptions) -> Result<()> {
     let user_randomness = rand::random::<[u8; 32]>();
     let provider = opts.provider;
 
-    tracing::info!("starting");
-
     let mut last_block_number = contract.provider().get_block_number().await?;
     tracing::info!(block_number = last_block_number.as_u64(), "block number");
 
+    tracing::info!("Requesting random number...");
+
     // Request a random number on the contract
     let sequence_number = contract
         .request_with_callback_wrapper(&provider, &user_randomness)
         .await?;
 
-    tracing::info!(sequence_number = sequence_number, "random number requested",);
+    tracing::info!(sequence_number = sequence_number, "Random number requested",);
 
-    for _i in [0..10] {
+    for _i in 0..10 {
         let current_block_number = contract.provider().get_block_number().await?;
         tracing::info!(
             start_block = last_block_number.as_u64(),
@@ -40,7 +44,10 @@ pub async fn generate(opts: &GenerateOptions) -> Result<()> {
         );
 
         let mut event = contract.revealed_with_callback_filter();
-        event.filter = event.filter.from_block(last_block_number).to_block(current_block_number);
+        event.filter = event
+            .filter
+            .from_block(last_block_number)
+            .to_block(current_block_number);
 
         let res: Vec<RevealedWithCallbackFilter> = event.query().await?;
 
@@ -58,5 +65,7 @@ pub async fn generate(opts: &GenerateOptions) -> Result<()> {
         time::sleep(Duration::from_secs(1)).await;
     }
 
+    tracing::info!("Failed to receive a callback with the random number.");
+
     Ok(())
 }

apps/fortuna/src/command/inspect.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        chain::ethereum::{PythContract, EntropyStructsV2Request},
+        chain::ethereum::{EntropyStructsV2Request, PythContract},
         config::{Config, EthereumConfig, InspectOptions},
     },
     anyhow::Result,
@@ -89,7 +89,10 @@ async fn inspect_chain(
     Ok(())
 }
 
-async fn process_request(rpc_provider: Provider<Http>, request: EntropyStructsV2Request) -> Result<()> {
+async fn process_request(
+    rpc_provider: Provider<Http>,
+    request: EntropyStructsV2Request,
+) -> Result<()> {
     if request.sequence_number != 0 && request.callback_status != 0 {
         let block = rpc_provider
             .get_block(request.block_number)