Skip to content

Commit

Permalink
Further CI fixes for cargo doc build
Browse files Browse the repository at this point in the history
  • Loading branch information
zbuc committed Apr 9, 2024
1 parent 9b5922a commit 861f6e8
Show file tree
Hide file tree
Showing 34 changed files with 15 additions and 50 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/cargo-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ jobs:
env:
RUSTDOCFLAGS: "--enable-index-page -Zunstable-options --cfg docsrs"
with:
command: doc
args: --all-features
- name: Push API documentation to GitHub Pages
if: github.ref == 'refs/heads/main'
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.IBC_RS_DOC_PRIVATE_KEY }}
external_repository: informalsystems/hermes-api-doc
publish_dir: ./target/doc
command: +nightly doc
args: --all-features --no-deps
# Disabled on penumbra hermes fork
# - name: Push API documentation to GitHub Pages
# if: github.ref == 'refs/heads/main'
# uses: peaceiris/actions-gh-pages@v3
# with:
# deploy_key: ${{ secrets.IBC_RS_DOC_PRIVATE_KEY }}
# external_repository: informalsystems/hermes-api-doc
# publish_dir: ./target/doc
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/evidence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use std::{
time::Duration,
};

use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::{
chain::{
cosmos::CosmosSdkChain,
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/health.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{endpoint::HealthCheck::*, handle::ChainHandle};

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer-cli/src/commands/listen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use core::{
};
use std::thread;

use abscissa_core::{application::fatal_error, clap::Parser, Runnable};
use abscissa_core::application::fatal_error;
use eyre::eyre;
use ibc_relayer::{
chain::handle::Subscription,
Expand Down
2 changes: 0 additions & 2 deletions crates/relayer-cli/src/commands/logs/reset.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};

use crate::{components::default_directive, prelude::*, tracing_handle::send_command};

#[derive(Clone, Command, Debug, Parser, PartialEq, Eq)]
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/misbehaviour.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::ops::Deref;

use abscissa_core::{clap::Parser, Command, Runnable};
use eyre::eyre;
use ibc_relayer::{
chain::{
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/channel.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{
handle::ChainHandle,
requests::{IncludeProof, QueryChannelRequest, QueryHeight},
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/channel_ends.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use eyre::eyre;
use ibc_relayer::{
chain::{
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/channels.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use core::fmt::{Debug, Error, Formatter};

use abscissa_core::{clap::Parser, Runnable};
use eyre::eyre;
use ibc_relayer::{
chain::{
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/clients.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{
handle::ChainHandle,
requests::{PageRequest, QueryClientStatesRequest},
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/connection.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{
handle::ChainHandle,
requests::{
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/connections.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Runnable};
use ibc_relayer::chain::{
handle::ChainHandle,
requests::{
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/packet/ack.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{
handle::ChainHandle,
requests::{IncludeProof, QueryHeight, QueryPacketAcknowledgementRequest},
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/packet/acks.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{counterparty::acknowledgements_on_chain, handle::BaseChainHandle};
use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ChannelId, PortId};

Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/packet/commitment.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{
handle::ChainHandle,
requests::{IncludeProof, QueryHeight, QueryPacketCommitmentRequest},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::counterparty::commitments_on_chain;
use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ChannelId, PortId};

Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/query/packet/pending.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use core::fmt;

use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::chain::{
counterparty::{channel_on_destination, pending_packet_summary, PendingPackets},
handle::{BaseChainHandle, ChainHandle},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::{
chain::{counterparty::unreceived_acknowledgements, handle::BaseChainHandle},
path::PathIdentifiers,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::{
chain::{counterparty::unreceived_packets, handle::BaseChainHandle},
path::PathIdentifiers,
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/start.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::{error::Error, io};

use abscissa_core::{clap::Parser, Command, Runnable};
use crossbeam_channel::Sender;
use ibc_relayer::{
chain::handle::{CachingChainHandle, ChainHandle},
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/tx/channel.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![allow(clippy::redundant_closure_call)]

use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::{
chain::{
handle::ChainHandle,
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/tx/connection.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![allow(clippy::redundant_closure_call)]

use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::connection::{Connection, ConnectionSide};
use ibc_relayer_types::{
core::ics24_host::identifier::{ChainId, ClientId, ConnectionId},
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/tx/packet.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::ops::RangeInclusive;

use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::{
chain::handle::ChainHandle,
link::{Link, LinkParameters},
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer-cli/src/commands/tx/transfer.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use core::time::Duration;

use abscissa_core::{clap::Parser, config::Override, Command, FrameworkErrorKind, Runnable};
use abscissa_core::{config::Override, FrameworkErrorKind};
use eyre::eyre;
use ibc_relayer::{
chain::handle::ChainHandle,
Expand Down
1 change: 0 additions & 1 deletion crates/relayer-cli/src/commands/tx/upgrade.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use core::time::Duration;

use abscissa_core::{clap::Parser, Command, Runnable};
use ibc_relayer::upgrade_chain::{
build_and_send_ibc_upgrade_proposal, requires_legacy_upgrade_proposal, UpgradePlanOptions,
};
Expand Down
1 change: 1 addition & 0 deletions crates/relayer-cli/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//! which are generally useful and should be available in every module with
//! `use crate::prelude::*;
pub use abscissa_core::clap::Parser;
/// Abscissa core prelude
pub use abscissa_core::prelude::*;
pub use abscissa_core::Command;
Expand Down
7 changes: 1 addition & 6 deletions crates/relayer/src/chain/cosmos.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
use alloc::sync::Arc;
use core::{
convert::{TryFrom, TryInto},
future::Future,
str::FromStr,
time::Duration,
};
use core::{future::Future, str::FromStr, time::Duration};
use std::{cmp::Ordering, thread};

use bytes::{Buf, Bytes};
Expand Down
1 change: 0 additions & 1 deletion crates/relayer/src/chain/cosmos/query/custom.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use hex;
use ibc_relayer_types::applications::ics31_icq::{
error::Error as CrossChainQueryError, response::CrossChainQueryResponse,
};
Expand Down
1 change: 0 additions & 1 deletion crates/relayer/src/chain/endpoint.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use alloc::sync::Arc;
use core::convert::TryFrom;

use ibc_proto::ibc::apps::fee::v1::{
QueryIncentivizedPacketRequest, QueryIncentivizedPacketResponse,
Expand Down
1 change: 0 additions & 1 deletion crates/relayer/src/chain/penumbra/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use tracing::info;
use crate::chain::client::ClientSettings;
use crate::chain::cosmos::query::{abci_query, QueryResponse};
use crate::chain::endpoint::ChainStatus;
use crate::chain::requests::IncludeProof;
use crate::chain::requests::*;
use crate::chain::tracking::TrackedMsgs;
use crate::client_state::{AnyClientState, IdentifiedAnyClientState};
Expand Down
4 changes: 0 additions & 4 deletions crates/relayer/src/config/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,6 @@ impl<'de> Deserialize<'de> for ChannelFilterMatch {
}

pub(crate) mod port {
use ibc_relayer_types::core::ics24_host::identifier::PortId;

use super::*;

pub struct PortFilterMatchVisitor;
Expand Down Expand Up @@ -401,8 +399,6 @@ pub(crate) mod port {
}

pub(crate) mod channel {
use ibc_relayer_types::core::ics24_host::identifier::ChannelId;

use super::*;

pub struct ChannelFilterMatchVisitor;
Expand Down
1 change: 0 additions & 1 deletion crates/relayer/src/event/source/websocket/extract.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use alloc::collections::BTreeMap as HashMap;
use core::convert::TryFrom;

use ibc_relayer_types::{
applications::{ics29_fee::events::DistributionType, ics31_icq::events::CrossChainQueryPacket},
Expand Down
1 change: 0 additions & 1 deletion crates/relayer/src/link/cli.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use std::{
convert::TryInto,
ops::RangeInclusive,
thread,
time::{Duration, Instant},
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer/src/link/pending.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use core::{iter::Iterator, time::Duration};
use core::time::Duration;
use std::time::Instant;

use ibc_relayer_types::{
Expand Down

0 comments on commit 861f6e8

Please sign in to comment.