make cancel optional

Author: bernard-wagner

crates/cast/bin/cmd/logs.rs

@@ -101,7 +101,7 @@ impl LogsArgs {
         }
 
         let mut stdout = io::stdout();
-        cast.subscribe(filter, &mut stdout, json, ctrl_c_future()).await?;
+        cast.subscribe(filter, &mut stdout, json, Some(ctrl_c_future())).await?;
 
         Ok(())
     }

crates/cast/src/lib.rs

@@ -18,7 +18,7 @@ use evm_disassembler::{disassemble_bytes, disassemble_str, format_operations};
 use eyre::{Context, Result};
 use foundry_common::{abi::encode_args, fmt::*, TransactionReceiptWithRevertReason};
 pub use foundry_evm::*;
-use futures::{future::Either, pin_mut, Future, FutureExt, StreamExt};
+use futures::{future::Either, Future, FutureExt, StreamExt};
 use rayon::prelude::*;
 pub use rusoto_core::{
     credential::ChainProvider as AwsChainProvider, region::Region as AwsRegion,
@@ -891,7 +891,7 @@ where
         filter: Filter,
         output: &mut dyn io::Write,
         to_json: bool,
-        cancel: F,
+        cancel: Option<F>,
     ) -> Result<()>
     where
         <M as Middleware>::Provider: PubsubClient,
@@ -915,7 +915,7 @@ where
         }
 
         let mut first = true;
-        pin_mut!(cancel);
+        let mut cancel = cancel.map(Box::pin);
 
         loop {
             tokio::select! {
@@ -948,8 +948,14 @@ where
                     }
                 },
                 // Break on cancel signal, to allow for closing JSON bracket
-                _ = &mut cancel => {
-                    break;
+                _ =  if let Some(ref mut cancel) = cancel { 
+                    Either::Left(cancel) 
+                } else { 
+                    Either::Right(futures::future::pending()) 
+                } => {
+                    if cancel.is_some() {
+                        break;
+                    }
                 },
                 else => break,
             }