Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 7563ed2

Browse files
coriolinuscoriolinus
committed
normalize spacing and Display vs Debug
1 parent d3e329d commit 7563ed2

File tree

20 files changed

+97
-90
lines changed

20 files changed

+97
-90
lines changed

‎core-primitives/src/lib.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ pub type Hash = sp_core::H256;
5858
#[derive(Clone, Copy, codec::Encode, codec::Decode, Hash, Eq, PartialEq, Debug, Default)]
5959
pub struct CandidateHash(pub Hash);
6060

61+
#[cfg(feature="std")]
62+
impl std::fmt::Display for CandidateHash {
63+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
64+
self.0.fmt(f)
65+
}
66+
}
67+
6168
/// Index of a transaction in the relay chain. 32-bit should be plenty.
6269
pub type Nonce = u32;
6370

‎node/collation-generation/src/lib.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl CollationGenerationSubsystem {
9595
msg = receiver.next().fuse() => {
9696
if let Some(msg) = msg {
9797
if let Err(err) = ctx.send_message(msg).await {
98-
tracing::warn!(target: LOG_TARGET, err=?err, "failed to forward message to overseer: {:?}", err);
98+
tracing::warn!(target: LOG_TARGET, err = ?err, "failed to forward message to overseer: {:?}", err);
9999
break;
100100
}
101101
}
@@ -129,7 +129,7 @@ impl CollationGenerationSubsystem {
129129
if let Err(err) =
130130
handle_new_activations(config.clone(), &activated, ctx, metrics, sender).await
131131
{
132-
tracing::warn!(target: LOG_TARGET, err=?err, "failed to handle new activations: {}", err);
132+
tracing::warn!(target: LOG_TARGET, err = ?err, "failed to handle new activations: {}", err);
133133
};
134134
}
135135
false
@@ -149,7 +149,7 @@ impl CollationGenerationSubsystem {
149149
Err(err) => {
150150
tracing::error!(
151151
target: LOG_TARGET,
152-
err=?err,
152+
err = ?err,
153153
"error receiving message from subsystem context: {:?}",
154154
err
155155
);
@@ -266,8 +266,8 @@ async fn handle_new_activations<Context: SubsystemContext>(
266266
Err(err) => {
267267
tracing::error!(
268268
target: LOG_TARGET,
269-
para_id=%scheduled_core.para_id,
270-
err=?err,
269+
para_id = %scheduled_core.para_id,
270+
err = ?err,
271271
"failed to calculate erasure root for para_id {}: {:?}",
272272
scheduled_core.para_id,
273273
err
@@ -305,8 +305,8 @@ async fn handle_new_activations<Context: SubsystemContext>(
305305
)).await {
306306
tracing::warn!(
307307
target: LOG_TARGET,
308-
para_id= %scheduled_core.para_id,
309-
err=?err,
308+
para_id = %scheduled_core.para_id,
309+
err = ?err,
310310
"failed to send collation result for para_id {}: {:?}",
311311
scheduled_core.para_id,
312312
err

‎node/core/av-store/src/lib.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,19 +612,19 @@ where
612612
let events = match request_candidate_events(ctx, hash).await {
613613
Ok(events) => events,
614614
Err(err) => {
615-
tracing::debug!(target: LOG_TARGET, err=?err, "requesting candidate events failed due to {}", err);
615+
tracing::debug!(target: LOG_TARGET, err = ?err, "requesting candidate events failed due to {}", err);
616616
return Ok(());
617617
}
618618
};
619619

620-
tracing::trace!(target: LOG_TARGET, hash = ?hash, "block activated: {:?}", hash);
620+
tracing::trace!(target: LOG_TARGET, hash = %hash, "block activated: {:?}", hash);
621621
let mut included = HashSet::new();
622622

623623
for event in events.into_iter() {
624624
if let CandidateEvent::CandidateIncluded(receipt, _) = event {
625625
tracing::trace!(
626626
target: LOG_TARGET,
627-
hash = ?receipt.hash(),
627+
hash = %receipt.hash(),
628628
"Candidate {:?} was included", receipt.hash(),
629629
);
630630
included.insert(receipt.hash());
@@ -1002,7 +1002,7 @@ fn query_inner<D: Decode>(
10021002
}
10031003
Ok(None) => None,
10041004
Err(e) => {
1005-
tracing::warn!(target: LOG_TARGET, err=?e, "Error reading from the availability store: {:?}", e);
1005+
tracing::warn!(target: LOG_TARGET, err = ?e, "Error reading from the availability store: {:?}", e);
10061006
None
10071007
}
10081008
}

‎node/core/backing/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ impl util::JobTrait for CandidateBackingJob {
782782
Err(e) => {
783783
tracing::warn!(
784784
target: LOG_TARGET,
785-
err=?e,
785+
err = ?e,
786786
"Failed to fetch runtime API data for job: {:?}",
787787
e,
788788
);
@@ -823,7 +823,7 @@ impl util::JobTrait for CandidateBackingJob {
823823
Err(e) => {
824824
tracing::warn!(
825825
target: LOG_TARGET,
826-
err=?e,
826+
err = ?e,
827827
"Cannot participate in candidate backing: {:?}",
828828
e
829829
);

‎node/core/bitfield-signing/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ async fn get_core_availability(
164164
Ok(None) => return Ok(false),
165165
Err(e) => {
166166
// Don't take down the node on runtime API errors.
167-
tracing::warn!(target: LOG_TARGET, err=?e, "Encountered a runtime API error: {:?}", e);
167+
tracing::warn!(target: LOG_TARGET, err = ?e, "Encountered a runtime API error: {:?}", e);
168168
return Ok(false);
169169
}
170170
};
@@ -293,7 +293,7 @@ impl JobTrait for BitfieldSigningJob {
293293
{
294294
Err(Error::Runtime(runtime_err)) => {
295295
// Don't take down the node on runtime API errors.
296-
tracing::warn!(target: LOG_TARGET, err=?runtime_err, "Encountered a runtime API error: {:?}", runtime_err);
296+
tracing::warn!(target: LOG_TARGET, err = ?runtime_err, "Encountered a runtime API error: {:?}", runtime_err);
297297
return Ok(());
298298
}
299299
Err(err) => return Err(err),

‎node/core/candidate-selection/src/lib.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl CandidateSelectionJob {
214214
Err(err) => {
215215
tracing::warn!(
216216
target: TARGET,
217-
err=?err,
217+
err = ?err,
218218
"failed to get collation from collator protocol subsystem: {:?}",
219219
err
220220
);
@@ -231,7 +231,7 @@ impl CandidateSelectionJob {
231231
)
232232
.await
233233
{
234-
Err(err) => tracing::warn!(target: TARGET, err=?err, "failed to second a candidate: {:?}", err),
234+
Err(err) => tracing::warn!(target: TARGET, err = ?err, "failed to second a candidate: {:?}", err),
235235
Ok(()) => self.seconded_candidate = Some(collator_id),
236236
}
237237
}
@@ -250,7 +250,7 @@ impl CandidateSelectionJob {
250250
};
251251
tracing::info!(
252252
target: TARGET,
253-
candidate_receipt=?candidate_receipt,
253+
candidate_receipt = ?candidate_receipt,
254254
"received invalidity note for candidate {:?}",
255255
candidate_receipt
256256
);
@@ -259,7 +259,7 @@ impl CandidateSelectionJob {
259259
if let Err(err) = forward_invalidity_note(received_from, &mut self.sender).await {
260260
tracing::warn!(
261261
target: TARGET,
262-
err=?err,
262+
err = ?err,
263263
"failed to forward invalidity note: {:?}",
264264
err
265265
);
@@ -308,7 +308,7 @@ async fn second_candidate(
308308
.await
309309
{
310310
Err(err) => {
311-
tracing::warn!(target: TARGET, err=?err, "failed to send a seconding message");
311+
tracing::warn!(target: TARGET, err = ?err, "failed to send a seconding message");
312312
metrics.on_second(Err(()));
313313
Err(err.into())
314314
}

‎node/core/proposer/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ where
193193
let provisioner_data = match self.get_provisioner_data().await {
194194
Ok(pd) => pd,
195195
Err(err) => {
196-
tracing::warn!(err=?err, "could not get provisioner inherent data; injecting default data: {}", err);
196+
tracing::warn!(err = ?err, "could not get provisioner inherent data; injecting default data: {}", err);
197197
Default::default()
198198
}
199199
};

‎node/core/provisioner/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl ProvisioningJob {
205205
)
206206
.await
207207
{
208-
tracing::warn!(target: LOG_TARGET, err=?err, "failed to assemble or send inherent data: {:?}", err);
208+
tracing::warn!(target: LOG_TARGET, err = ?err, "failed to assemble or send inherent data: {:?}", err);
209209
self.metrics.on_inherent_data_request(Err(()));
210210
} else {
211211
self.metrics.on_inherent_data_request(Ok(()));
@@ -462,8 +462,8 @@ fn bitfields_indicate_availability(
462462
// simpler to just handle the error internally here.
463463
tracing::warn!(
464464
target: LOG_TARGET,
465-
validator_idx=%validator_idx,
466-
availability_len=%availability_len,
465+
validator_idx = %validator_idx,
466+
availability_len = %availability_len,
467467
"attempted to set a transverse bit at idx {} which is greater than bitfield size {}",
468468
validator_idx,
469469
availability_len,

‎node/network/availability-distribution/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ impl AvailabilityDistributionSubsystem {
797797
{
798798
warn!(
799799
target: TARGET,
800-
err=?e,
800+
err = ?e,
801801
"Failed to handle incoming network messages: {:?}", e
802802
);
803803
}

‎node/network/bitfield-distribution/src/lib.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl BitfieldDistribution {
154154
let message = match ctx.recv().await {
155155
Ok(message) => message,
156156
Err(e) => {
157-
debug!(target: LOG_TARGET, err=?e, "Failed to receive a message from Overseer: {}, exiting", e);
157+
debug!(target: LOG_TARGET, err = ?e, "Failed to receive a message from Overseer: {}, exiting", e);
158158
return;
159159
},
160160
};
@@ -170,7 +170,7 @@ impl BitfieldDistribution {
170170
hash,
171171
signed_availability,
172172
).await {
173-
warn!(target: LOG_TARGET, err=?err, "Failed to reply to `DistributeBitfield` message: {}", err);
173+
warn!(target: LOG_TARGET, err = ?err, "Failed to reply to `DistributeBitfield` message: {}", err);
174174
}
175175
}
176176
FromOverseer::Communication {
@@ -179,12 +179,12 @@ impl BitfieldDistribution {
179179
trace!(target: LOG_TARGET, "Processing NetworkMessage");
180180
// a network message was received
181181
if let Err(e) = handle_network_msg(&mut ctx, &mut state, &self.metrics, event).await {
182-
warn!(target: LOG_TARGET, err=?e, "Failed to handle incoming network messages: {:?}", e);
182+
warn!(target: LOG_TARGET, err = ?e, "Failed to handle incoming network messages: {:?}", e);
183183
}
184184
}
185185
FromOverseer::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate { activated, deactivated })) => {
186186
for relay_parent in activated {
187-
trace!(target: LOG_TARGET, relay_parent = ?relay_parent, "Start {:?}", relay_parent);
187+
trace!(target: LOG_TARGET, relay_parent = %relay_parent, "Start {:?}", relay_parent);
188188
// query basic system parameters once
189189
match query_basics(&mut ctx, relay_parent).await {
190190
Ok(Some((validator_set, signing_context))) => {
@@ -203,19 +203,19 @@ impl BitfieldDistribution {
203203
);
204204
}
205205
Err(e) => {
206-
warn!(target: LOG_TARGET, err=?e, "query_basics has failed: {}", e);
206+
warn!(target: LOG_TARGET, err = ?e, "query_basics has failed: {}", e);
207207
}
208208
_ => {},
209209
}
210210
}
211211

212212
for relay_parent in deactivated {
213-
trace!(target: LOG_TARGET, relay_parent=?relay_parent, "Stop {:?}", relay_parent);
213+
trace!(target: LOG_TARGET, relay_parent = %relay_parent, "Stop {:?}", relay_parent);
214214
// defer the cleanup to the view change
215215
}
216216
}
217217
FromOverseer::Signal(OverseerSignal::BlockFinalized(hash)) => {
218-
trace!(target: LOG_TARGET, hash=?hash, "Block finalized {:?}", hash);
218+
trace!(target: LOG_TARGET, hash = %hash, "Block finalized {:?}", hash);
219219
}
220220
FromOverseer::Signal(OverseerSignal::Conclude) => {
221221
trace!(target: LOG_TARGET, "Conclude");
@@ -235,7 +235,7 @@ async fn modify_reputation<Context>(
235235
where
236236
Context: SubsystemContext<Message = BitfieldDistributionMessage>,
237237
{
238-
trace!(target: LOG_TARGET, rep=?rep, peer=?peer, "Reputation change of {:?} for peer {:?}", rep, peer);
238+
trace!(target: LOG_TARGET, rep = ?rep, peer_id = %peer, "Reputation change of {:?} for peer {:?}", rep, peer);
239239
ctx.send_message(AllMessages::NetworkBridge(
240240
NetworkBridgeMessage::ReportPeer(peer, rep),
241241
))
@@ -262,15 +262,15 @@ where
262262
} else {
263263
trace!(
264264
target: LOG_TARGET,
265-
relay_parent=?relay_parent,
265+
relay_parent = %relay_parent,
266266
"Not supposed to work on relay parent related data",
267267
);
268268

269269
return Ok(());
270270
};
271271
let validator_set = &job_data.validator_set;
272272
if validator_set.is_empty() {
273-
trace!(target: LOG_TARGET, relay_parent=?relay_parent, "Validator set for {:?} is empty", relay_parent);
273+
trace!(target: LOG_TARGET, relay_parent = %relay_parent, "Validator set for {:?} is empty", relay_parent);
274274
return Ok(());
275275
}
276276

@@ -344,7 +344,7 @@ where
344344
if interested_peers.is_empty() {
345345
trace!(
346346
target: LOG_TARGET,
347-
relay_parent = ?message.relay_parent,
347+
relay_parent = %message.relay_parent,
348348
"No peers are interested in gossip for relay parent {:?}",
349349
message.relay_parent
350350
);
@@ -388,7 +388,7 @@ where
388388
if validator_set.is_empty() {
389389
trace!(
390390
target: LOG_TARGET,
391-
relay_parent = ?message.relay_parent,
391+
relay_parent = %message.relay_parent,
392392
"Validator set for relay parent {:?} is empty",
393393
&message.relay_parent
394394
);
@@ -477,7 +477,7 @@ where
477477
NetworkBridgeEvent::PeerMessage(remote, message) => {
478478
match message {
479479
protocol_v1::BitfieldDistributionMessage::Bitfield(relay_parent, bitfield) => {
480-
trace!(target: LOG_TARGET, peer=?remote, "Received bitfield gossip from peer {:?}", &remote);
480+
trace!(target: LOG_TARGET, peer_id = %remote, "Received bitfield gossip from peer {:?}", &remote);
481481
let gossiped_bitfield = BitfieldGossipMessage {
482482
relay_parent,
483483
signed_availability: bitfield,
@@ -498,7 +498,7 @@ fn handle_our_view_change(state: &mut ProtocolState, view: View) -> SubsystemRes
498498
if !state.per_relay_parent.contains_key(&added) {
499499
warn!(
500500
target: LOG_TARGET,
501-
added=%added,
501+
added = %added,
502502
"Our view contains {} but the overseer never told use we should work on this",
503503
&added
504504
);
@@ -643,7 +643,7 @@ where
643643
SigningContext { parent_hash: relay_parent, session_index: s },
644644
))),
645645
(Err(e), _) | (_, Err(e)) => {
646-
warn!(target: LOG_TARGET, err=?e, "Failed to fetch basics from runtime API: {:?}", e);
646+
warn!(target: LOG_TARGET, err = ?e, "Failed to fetch basics from runtime API: {:?}", e);
647647
Ok(None)
648648
}
649649
}

0 commit comments

Comments
 (0)