pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 16:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo +nightly fmt (#3540)

Browse Source 
* cargo +nightly fmt

* add cargo-fmt check to ci

* update ci

* fmt

* fmt

* skip macro

* ignore bridges
This commit is contained in:
Shawn Tabrizi
2021-08-02 12:47:33 +02:00
committed by GitHub
parent 30e3012270
commit ff5d56fb76
350 changed files with 20617 additions and 21266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/subsystem-types/src/errors.rs
+6 -3
View File
@@ -16,7 +16,6 @@
//! Error types for the subsystem requests.
use crate::JaegerError;
/// A description of an error causing the runtime API request to be unservable.
@@ -125,7 +124,8 @@ pub enum SubsystemError {
/// An additional annotation tag for the origin of `source`.
origin: &'static str,
/// The wrapped error. Marked as source for tracking the error chain.
#[source] source: Box<dyn 'static + std::error::Error + Send + Sync>
#[source]
source: Box<dyn 'static + std::error::Error + Send + Sync>,
},
}
@@ -140,7 +140,10 @@ pub enum SubsystemError {
impl SubsystemError {
/// Adds a `str` as `origin` to the given error `err`.
pub fn with_origin<E: 'static + Send + Sync + std::error::Error>(origin: &'static str, err: E) -> Self {
pub fn with_origin<E: 'static + Send + Sync + std::error::Error>(
origin: &'static str,
err: E,
) -> Self {
Self::FromOrigin { origin, source: Box::new(err) }
}
}
polkadot/node/subsystem-types/src/lib.rs
+6 -7
View File
@@ -22,16 +22,16 @@
#![warn(missing_docs)]
use std::{sync::Arc, fmt};
use std::{fmt, sync::Arc};
pub use polkadot_primitives::v1::{Hash, BlockNumber};
pub use polkadot_primitives::v1::{BlockNumber, Hash};
use smallvec::SmallVec;
pub mod errors;
pub mod messages;
pub use polkadot_node_jaeger as jaeger;
pub use jaeger::*;
pub use polkadot_node_jaeger as jaeger;
/// How many slots are stack-reserved for active leaves updates
///
@@ -39,7 +39,6 @@ pub use jaeger::*;
/// If there are greater than this number of slots, then we fall back to a heap vector.
const ACTIVE_LEAVES_SMALLVEC_CAPACITY: usize = 8;
/// The status of an activated leaf.
#[derive(Debug, Clone)]
pub enum LeafStatus {
@@ -118,9 +117,9 @@ impl PartialEq for ActiveLeavesUpdate {
///
/// Instead, it means equality when `activated` and `deactivated` are considered as sets.
fn eq(&self, other: &Self) -> bool {
self.activated.as_ref().map(|a| a.hash) == other.activated.as_ref().map(|a| a.hash)
&& self.deactivated.len() == other.deactivated.len()
&& self.deactivated.iter().all(|a| other.deactivated.contains(a))
self.activated.as_ref().map(|a| a.hash) == other.activated.as_ref().map(|a| a.hash) &&
self.deactivated.len() == other.deactivated.len() &&
self.deactivated.iter().all(|a| other.deactivated.contains(a))
}
}
polkadot/node/subsystem-types/src/messages.rs
+27 -26
View File
@@ -22,14 +22,22 @@
//!
//! Subsystems' APIs are defined separately from their implementation, leading to easier mocking.
use futures::channel::{mpsc, oneshot};
use thiserror::Error;
pub use sc_network::IfDisconnected;
use polkadot_node_network_protocol::{PeerId, UnifiedReputationChange, peer_set::PeerSet, request_response::{request::IncomingRequest, v1 as req_res_v1, Requests}, v1 as protocol_v1};
use polkadot_node_primitives::{AvailableData, BabeEpoch, BlockWeight, CandidateVotes, CollationGenerationConfig, DisputeMessage, ErasureChunk, PoV, SignedDisputeStatement, SignedFullStatement, ValidationResult, approval::{BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote}};
use polkadot_node_network_protocol::{
peer_set::PeerSet,
request_response::{request::IncomingRequest, v1 as req_res_v1, Requests},
v1 as protocol_v1, PeerId, UnifiedReputationChange,
};
use polkadot_node_primitives::{
approval::{BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote},
AvailableData, BabeEpoch, BlockWeight, CandidateVotes, CollationGenerationConfig,
DisputeMessage, ErasureChunk, PoV, SignedDisputeStatement, SignedFullStatement,
ValidationResult,
};
use polkadot_primitives::v1::{
AuthorityDiscoveryId, BackedCandidate, BlockNumber, CandidateDescriptor, CandidateEvent,
CandidateHash, CandidateIndex, CandidateReceipt, CollatorId, CommittedCandidateReceipt,
@@ -222,7 +230,7 @@ pub enum DisputeCoordinatorMessage {
/// - or other explicit votes on that candidate already recorded
/// - or recovered availability for the candidate
/// - or the imported statements are backing/approval votes, which are always accepted.
pending_confirmation: oneshot::Sender<ImportStatementsResult>
pending_confirmation: oneshot::Sender<ImportStatementsResult>,
},
/// Fetch a list of all recent disputes the co-ordinator is aware of.
/// These are disputes which have occurred any time in recent sessions,
@@ -252,7 +260,7 @@ pub enum DisputeCoordinatorMessage {
block_descriptions: Vec<BlockDescription>,
/// A response channel - `None` to vote on base, `Some` to vote higher.
tx: oneshot::Sender<Option<(BlockNumber, Hash)>>,
}
},
}
/// The result of `DisputeCoordinatorMessage::ImportStatements`.
@@ -261,7 +269,7 @@ pub enum ImportStatementsResult {
/// Import was invalid (candidate was not available) and the sending peer should get banned.
InvalidImport,
/// Import was valid and can be confirmed to peer.
ValidImport
ValidImport,
}
/// Messages received by the dispute participation subsystem.
@@ -286,7 +294,6 @@ pub enum DisputeParticipationMessage {
/// Messages going to the dispute distribution subsystem.
#[derive(Debug)]
pub enum DisputeDistributionMessage {
/// Tell dispute distribution to distribute an explicit dispute statement to
/// validators.
SendDispute(DisputeMessage),
@@ -350,7 +357,7 @@ pub enum NetworkBridgeMessage {
/// Ids of our neighbors in the new gossip topology.
/// We're not necessarily connected to all of them, but we should.
our_neighbors: HashSet<AuthorityDiscoveryId>,
}
},
}
impl NetworkBridgeMessage {
@@ -486,7 +493,13 @@ pub enum AvailabilityStoreMessage {
/// If `ValidatorIndex` is present store corresponding chunk also.
///
/// Return `Ok(())` if the store operation succeeded, `Err(())` if it failed.
StoreAvailableData(CandidateHash, Option<ValidatorIndex>, u32, AvailableData, oneshot::Sender<Result<(), ()>>),
StoreAvailableData(
CandidateHash,
Option<ValidatorIndex>,
u32,
AvailableData,
oneshot::Sender<Result<(), ()>>,
),
}
impl AvailabilityStoreMessage {
@@ -605,11 +618,7 @@ pub enum RuntimeApiRequest {
/// Get the validation code for a para, taking the given `OccupiedCoreAssumption`, which
/// will inform on how the validation data should be computed if the para currently
/// occupies a core.
ValidationCode(
ParaId,
OccupiedCoreAssumption,
RuntimeApiSender<Option<ValidationCode>>,
),
ValidationCode(ParaId, OccupiedCoreAssumption, RuntimeApiSender<Option<ValidationCode>>),
/// Get validation code by its hash, either past, current or future code can be returned, as long as state is still
/// available.
ValidationCodeByHash(ValidationCodeHash, RuntimeApiSender<Option<ValidationCode>>),
@@ -621,10 +630,7 @@ pub enum RuntimeApiRequest {
/// Get the session info for the given session, if stored.
SessionInfo(SessionIndex, RuntimeApiSender<Option<SessionInfo>>),
/// Get all the pending inbound messages in the downward message queue for a para.
DmqContents(
ParaId,
RuntimeApiSender<Vec<InboundDownwardMessage<BlockNumber>>>,
),
DmqContents(ParaId, RuntimeApiSender<Vec<InboundDownwardMessage<BlockNumber>>>),
/// Get the contents of all channels addressed to the given recipient. Channels that have no
/// messages in them are also included.
InboundHrmpChannelsContents(
@@ -764,7 +770,7 @@ pub enum ApprovalCheckResult {
/// The vote was accepted and should be propagated onwards.
Accepted,
/// The vote was bad and should be ignored, reporting the peer who propagated it.
Bad(ApprovalCheckError)
Bad(ApprovalCheckError),
}
/// The error result type of [`ApprovalVotingMessage::CheckAndImportApproval`] request.
@@ -789,7 +795,6 @@ pub enum ApprovalCheckError {
Internal(Hash, CandidateHash),
}
/// Describes a relay-chain block by the para-chain candidates
/// it includes.
#[derive(Clone, Debug)]
@@ -830,10 +835,7 @@ pub enum ApprovalVotingMessage {
/// protocol.
///
/// Should not be sent unless the block hash within the indirect vote is known.
CheckAndImportApproval(
IndirectSignedApprovalVote,
oneshot::Sender<ApprovalCheckResult>,
),
CheckAndImportApproval(IndirectSignedApprovalVote, oneshot::Sender<ApprovalCheckResult>),
/// Returns the highest possible ancestor hash of the provided block hash which is
/// acceptable to vote on finality for.
/// The `BlockNumber` provided is the number of the block's ancestor which is the
@@ -864,8 +866,7 @@ pub enum ApprovalDistributionMessage {
/// Message to the Gossip Support subsystem.
#[derive(Debug)]
pub enum GossipSupportMessage {
}
pub enum GossipSupportMessage {}
impl From<IncomingRequest<req_res_v1::PoVFetchingRequest>> for AvailabilityDistributionMessage {
fn from(req: IncomingRequest<req_res_v1::PoVFetchingRequest>) -> Self {
polkadot/node/subsystem-types/src/messages/network_bridge_event.rs
+18 -17
View File
@@ -14,12 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use std::convert::TryFrom;
use std::collections::HashSet;
use std::{collections::HashSet, convert::TryFrom};
pub use sc_network::{ReputationChange, PeerId};
pub use sc_network::{PeerId, ReputationChange};
use polkadot_node_network_protocol::{WrongVariant, ObservedRole, OurView, View};
use polkadot_node_network_protocol::{ObservedRole, OurView, View, WrongVariant};
use polkadot_primitives::v1::AuthorityDiscoveryId;
/// Events from network.
@@ -67,21 +66,23 @@ impl<M> NetworkBridgeEvent<M> {
/// in which case the clone can be expensive and it only clones if the message type can
/// be focused.
pub fn focus<'a, T>(&'a self) -> Result<NetworkBridgeEvent<T>, WrongVariant>
where T: 'a + Clone, &'a T: TryFrom<&'a M, Error = WrongVariant>
where
T: 'a + Clone,
&'a T: TryFrom<&'a M, Error = WrongVariant>,
{
Ok(match *self {
NetworkBridgeEvent::PeerMessage(ref peer, ref msg)
=> NetworkBridgeEvent::PeerMessage(peer.clone(), <&'a T>::try_from(msg)?.clone()),
NetworkBridgeEvent::PeerConnected(ref peer, ref role, ref authority_id)
=> NetworkBridgeEvent::PeerConnected(peer.clone(), role.clone(), authority_id.clone()),
NetworkBridgeEvent::PeerDisconnected(ref peer)
=> NetworkBridgeEvent::PeerDisconnected(peer.clone()),
NetworkBridgeEvent::NewGossipTopology(ref peers)
=> NetworkBridgeEvent::NewGossipTopology(peers.clone()),
NetworkBridgeEvent::PeerViewChange(ref peer, ref view)
=> NetworkBridgeEvent::PeerViewChange(peer.clone(), view.clone()),
NetworkBridgeEvent::OurViewChange(ref view)
=> NetworkBridgeEvent::OurViewChange(view.clone()),
NetworkBridgeEvent::PeerMessage(ref peer, ref msg) =>
NetworkBridgeEvent::PeerMessage(peer.clone(), <&'a T>::try_from(msg)?.clone()),
NetworkBridgeEvent::PeerConnected(ref peer, ref role, ref authority_id) =>
NetworkBridgeEvent::PeerConnected(peer.clone(), role.clone(), authority_id.clone()),
NetworkBridgeEvent::PeerDisconnected(ref peer) =>
NetworkBridgeEvent::PeerDisconnected(peer.clone()),
NetworkBridgeEvent::NewGossipTopology(ref peers) =>
NetworkBridgeEvent::NewGossipTopology(peers.clone()),
NetworkBridgeEvent::PeerViewChange(ref peer, ref view) =>
NetworkBridgeEvent::PeerViewChange(peer.clone(), view.clone()),
NetworkBridgeEvent::OurViewChange(ref view) =>
NetworkBridgeEvent::OurViewChange(view.clone()),
})
}
}