fix errors [wip]

Author: JuArce

batcher/aligned-batcher/src/connection.rs

@@ -1,5 +1,4 @@
 use std::sync::Arc;
-use boring::ssl::{SslStream};
 
 use crate::types::{batch_queue::BatchQueueEntry, errors::BatcherError};
 use aligned_sdk::{
@@ -11,6 +10,7 @@ use lambdaworks_crypto::merkle_tree::merkle::MerkleTree;
 use log::{debug, error};
 use serde::Serialize;
 use tokio::{net::TcpStream, sync::RwLock};
+use tokio_boring::SslStream;
 use tokio_tungstenite::{
     tungstenite::{Error, Message},
     WebSocketStream,

batcher/aligned-batcher/src/lib.rs

@@ -15,7 +15,7 @@ use retry::{retry_function, RetryError};
 use tokio::time::{timeout, Instant};
 use types::batch_state::BatchState;
 use types::user_state::UserState;
-use boring::ssl::{SslMethod, SslAcceptor, SslStream, SslFiletype};
+use boring::ssl::{SslMethod, SslAcceptor, SslFiletype};
 use std::collections::HashMap;
 use std::env;
 use std::net::SocketAddr;
@@ -263,12 +263,11 @@ impl Batcher {
     }
 
     pub async fn listen_connections(self: Arc<Self>, address: &str, cert: PathBuf, key: PathBuf) -> Result<(), BatcherError> {
-        let mut acceptor;
         let mut acceptor_builder = SslAcceptor::mozilla_intermediate_v5(SslMethod::tls()).unwrap();
         acceptor_builder.set_private_key_file(key, SslFiletype::PEM).unwrap();
         acceptor_builder.set_certificate_chain_file(cert).unwrap();
         acceptor_builder.check_private_key().unwrap();
-        acceptor = Arc::new(acceptor_builder.build());
+        let acceptor = Arc::new(acceptor_builder.build());
 
         // Create the event loop and TCP listener we'll accept connections on.
         let listener = TcpListener::bind(address)

batcher/aligned-batcher/src/main.rs

@@ -25,10 +25,10 @@ struct Cli {
     #[arg(short, long)]
     port: Option<u16>,
     /// cert file
-    #[argh(option, short = 'c')]
+    #[arg(long, short = 'c')]
     cert: PathBuf,
     /// key file
-    #[argh(option, short = 'k')]
+    #[arg(long, short = 'k')]
     key: PathBuf,
 }
 

batcher/aligned/src/main.rs

@@ -66,7 +66,7 @@ pub struct SubmitArgs {
     #[arg(
         name = "Batcher connection address",
         long = "batcher_url",
-        default_value = "ws://localhost:8080"
+        default_value = "wss://localhost:8080"
     )]
     batcher_url: String,
     #[arg(