Skip to content

Commit

Permalink
cargo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hdevalence committed Apr 3, 2022
1 parent c3cfdf0 commit a7b2b37
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 23 deletions.
8 changes: 0 additions & 8 deletions ibc/src/ibcaction.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
use ibc_proto::ibc::core::channel::v1::{
MsgAcknowledgement, MsgChannelCloseConfirm, MsgChannelCloseInit, MsgChannelOpenAck,
MsgChannelOpenConfirm, MsgChannelOpenTry, MsgRecvPacket, MsgTimeout,
};
use ibc_proto::ibc::core::connection::v1::{
MsgConnectionOpenAck, MsgConnectionOpenConfirm, MsgConnectionOpenInit, MsgConnectionOpenTry,
};
use penumbra_crypto::{value, Fr, Value, Zero};
use penumbra_proto::{ibc as pb, Protobuf};

#[derive(Clone, Debug)]
Expand Down
2 changes: 1 addition & 1 deletion pd/src/components/shielded_pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use decaf377::{FieldExt, Fq, Fr};
use penumbra_chain::{sync::CompactBlock, NoteSource};
use penumbra_crypto::{
asset,
asset::{Denom, Id},
asset::Denom,
ka,
merkle::{self, Frontier, NoteCommitmentTree, TreeExt},
Address, Note, Nullifier, One, Value,
Expand Down
8 changes: 4 additions & 4 deletions pd/src/components/staking.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use anyhow::Result;
use async_trait::async_trait;
use penumbra_chain::params::ChainParams;

use penumbra_stake::Epoch;
use penumbra_transaction::Transaction;
use tendermint::abci;

use super::{Component, Overlay};
use crate::{components::validator_set::BlockChanges, genesis, PenumbraStore, WriteOverlayExt};
use crate::{components::validator_set::BlockChanges, genesis, PenumbraStore};

// Stub component
pub struct Staking {
Expand All @@ -19,7 +19,7 @@ impl Component for Staking {
Ok(Self { overlay })
}

async fn init_chain(&mut self, app_state: &genesis::AppState) -> Result<()> {
async fn init_chain(&mut self, _app_state: &genesis::AppState) -> Result<()> {
Ok(())
}

Expand All @@ -31,7 +31,7 @@ impl Component for Staking {
self.overlay.get_epoch_duration().await?,
);
// Reset all staking state in the JMT overlay
let block_changes = BlockChanges {
let _block_changes = BlockChanges {
starting_epoch: epoch,
new_validators: Default::default(),
updated_validators: Default::default(),
Expand Down
6 changes: 3 additions & 3 deletions pd/src/components/validator_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use penumbra_stake::{
ValidatorState, ValidatorStateName, ValidatorStatus, VerifiedValidatorDefinition,
STAKING_TOKEN_ASSET_ID, STAKING_TOKEN_DENOM,
};
use serde::{Deserialize, Serialize};

use sqlx::{query, Postgres, Transaction};
use tendermint::{
abci::types::{Evidence, ValidatorUpdate},
Expand Down Expand Up @@ -99,7 +99,7 @@ impl BlockChanges {
}

// Handle updating validators, incorporating any rate updates during epoch transitions.
for (ik, mut defs) in self.updated_validators {
for (_ik, mut defs) in self.updated_validators {
// Sort the validator definitions by sequence number + tiebreaker,
// in case there are conflicts.
defs.sort();
Expand Down Expand Up @@ -144,7 +144,7 @@ impl BlockChanges {
}

// Handle adding newly added validators with default rates
for (ik, mut defs) in self.new_validators {
for (_ik, mut defs) in self.new_validators {
// Sort the validator definitions by sequence number + tiebreaker,
// in case there are conflicts.
defs.sort();
Expand Down
4 changes: 2 additions & 2 deletions pd/src/state/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::{BTreeMap, VecDeque};
use anyhow::Result;
use ark_ff::PrimeField;
use decaf377::{Fq, Fr};
use jmt::storage::TreeWriter;

use penumbra_chain::params::ChainParams;
use penumbra_crypto::{
asset,
Expand All @@ -23,7 +23,7 @@ use crate::{
genesis,
pending_block::QuarantineGroup,
verify::{NoteData, PositionedNoteData},
PendingBlock, Storage, NUM_RECENT_ANCHORS,
PendingBlock, NUM_RECENT_ANCHORS,
};

#[derive(Debug)]
Expand Down
5 changes: 2 additions & 3 deletions pd/src/testnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ use std::{env::current_dir, fmt, io::Read, path::PathBuf, str::FromStr};
use anyhow::{Context, Result};
use directories::UserDirs;
use penumbra_crypto::Address;
use rand::Rng;
use rand_core::OsRng;

use regex::{Captures, Regex};
use serde::{de, Deserialize};
use tendermint::{node::Id, PrivateKey, PublicKey};
use tendermint::{node::Id, PrivateKey};

use crate::genesis;

Expand Down
2 changes: 1 addition & 1 deletion pd/src/wallet/server/thin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use penumbra_proto::{
TransactionByNoteRequest, TransactionDetail, ValidatorStatusRequest,
},
};
use penumbra_stake::IdentityKey;

use tokio::sync::mpsc;
use tokio_stream::wrappers::ReceiverStream;
use tonic::Status;
Expand Down
1 change: 0 additions & 1 deletion stake/src/epoch.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use serde::{Deserialize, Serialize};
use tendermint::block;

/// Epoch represents a given epoch for Penumbra and is used
Expand Down

0 comments on commit a7b2b37

Please sign in to comment.