From 389be1553ef037507d66fbb5ed253a91947bf658 Mon Sep 17 00:00:00 2001
From: elizabeth <elizabethjbinks@gmail.com>
Date: Fri, 1 Nov 2024 15:09:20 -0400
Subject: [PATCH] fix ci dov version, tools build

---
 .github/workflows/cargo-doc.yaml                   |  2 +-
 .../src/commands/query/packet/commitment.rs        |  7 -------
 crates/relayer-cli/tests/acceptance.rs             |  2 --
 crates/relayer/src/chain/cosmos/config.rs          |  2 +-
 crates/relayer/src/event.rs                        | 10 +++-------
 .../src/tests/ordered_channel_clear.rs             | 14 ++++++++++++++
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cargo-doc.yaml b/.github/workflows/cargo-doc.yaml
index ebc03618b6..507c0ee919 100644
--- a/.github/workflows/cargo-doc.yaml
+++ b/.github/workflows/cargo-doc.yaml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2023-07-13
+          toolchain: nightly-2024-09-15
           override: true
 
       - name: Build API documentation
diff --git a/crates/relayer-cli/src/commands/query/packet/commitment.rs b/crates/relayer-cli/src/commands/query/packet/commitment.rs
index cc4069fe60..9ca346d67a 100644
--- a/crates/relayer-cli/src/commands/query/packet/commitment.rs
+++ b/crates/relayer-cli/src/commands/query/packet/commitment.rs
@@ -22,7 +22,6 @@ use ibc_relayer_types::{
     },
     Height,
 };
-use serde::Serialize;
 use subtle_encoding::{
     Encoding,
     Hex,
@@ -38,12 +37,6 @@ use crate::{
     prelude::*,
 };
 
-#[derive(Serialize, Debug)]
-struct PacketSeqs {
-    height: Height,
-    seqs: Vec<u64>,
-}
-
 #[derive(Clone, Command, Debug, Parser, PartialEq, Eq)]
 pub struct QueryPacketCommitmentCmd {
     #[clap(
diff --git a/crates/relayer-cli/tests/acceptance.rs b/crates/relayer-cli/tests/acceptance.rs
index c50c4b0866..0f3e0c575e 100644
--- a/crates/relayer-cli/tests/acceptance.rs
+++ b/crates/relayer-cli/tests/acceptance.rs
@@ -30,7 +30,6 @@ use once_cell::sync::Lazy;
 pub static RUNNER: Lazy<CmdRunner> = Lazy::new(CmdRunner::default);
 
 /// Use `Config::default()` value if no config or args
-#[cfg(not(tarpaulin))]
 #[test]
 fn start_no_args() {
     let mut runner = RUNNER.clone();
@@ -46,7 +45,6 @@ fn start_no_args() {
     cmd.wait().unwrap().expect_success();
 }
 
-#[cfg(not(tarpaulin))]
 #[test]
 fn example_configuration_is_valid() {
     let mut runner = RUNNER.clone();
diff --git a/crates/relayer/src/chain/cosmos/config.rs b/crates/relayer/src/chain/cosmos/config.rs
index c64e8e0503..4dfbc753fc 100644
--- a/crates/relayer/src/chain/cosmos/config.rs
+++ b/crates/relayer/src/chain/cosmos/config.rs
@@ -71,7 +71,7 @@ pub struct CosmosSdkConfig {
     pub max_gas: Option<u64>,
 
     // This field is only meant to be set via the `update client` command,
-    // for when we need to ugprade a client across a genesis restart and
+    // for when we need to upgrade a client across a genesis restart and
     // therefore need and archive node to fetch blocks from.
     pub genesis_restart: Option<GenesisRestart>,
 
diff --git a/crates/relayer/src/event.rs b/crates/relayer/src/event.rs
index fa3fff5e54..d80b75defd 100644
--- a/crates/relayer/src/event.rs
+++ b/crates/relayer/src/event.rs
@@ -493,14 +493,10 @@ mod tests {
     };
     use ibc_relayer_types::{
         clients::ics07_tendermint::header::test_util::get_dummy_ics07_header,
-        core::{
-            ics02_client::header::{
-                decode_header,
-                AnyHeader,
-            },
-            ics04_channel::packet::Sequence,
+        core::ics02_client::header::{
+            decode_header,
+            AnyHeader,
         },
-        timestamp::Timestamp,
     };
 
     use super::*;
diff --git a/tools/integration-test/src/tests/ordered_channel_clear.rs b/tools/integration-test/src/tests/ordered_channel_clear.rs
index 0774bbeb60..fc202a7e59 100644
--- a/tools/integration-test/src/tests/ordered_channel_clear.rs
+++ b/tools/integration-test/src/tests/ordered_channel_clear.rs
@@ -67,6 +67,9 @@ impl TestOverrides for OrderedChannelClearTest {
                 ChainConfig::CosmosSdk(chain_config) => {
                     chain_config.sequential_batch_tx = self.sequential_batch_tx;
                 }
+                ChainConfig::Astria(chain_config) => {
+                    chain_config.sequential_batch_tx = self.sequential_batch_tx;
+                }
             }
         }
 
@@ -75,6 +78,9 @@ impl TestOverrides for OrderedChannelClearTest {
             ChainConfig::CosmosSdk(chain_config) => {
                 chain_config.sequential_batch_tx = self.sequential_batch_tx;
             }
+            ChainConfig::Astria(chain_config) => {
+                chain_config.sequential_batch_tx = self.sequential_batch_tx;
+            }
         }
     }
 
@@ -209,6 +215,10 @@ impl TestOverrides for OrderedChannelClearEqualCLITest {
                     chain_config.sequential_batch_tx = true;
                     chain_config.max_msg_num = MaxMsgNum::new(3).unwrap();
                 }
+                ChainConfig::Astria(chain_config) => {
+                    chain_config.sequential_batch_tx = true;
+                    chain_config.max_msg_num = MaxMsgNum::new(3).unwrap();
+                }
             }
         }
 
@@ -218,6 +228,10 @@ impl TestOverrides for OrderedChannelClearEqualCLITest {
                 chain_config.sequential_batch_tx = true;
                 chain_config.max_msg_num = MaxMsgNum::new(3).unwrap();
             }
+            ChainConfig::Astria(chain_config) => {
+                chain_config.sequential_batch_tx = true;
+                chain_config.max_msg_num = MaxMsgNum::new(3).unwrap();
+            }
         }
     }