Skip to content

Commit 6aa66de

Browse files
lowhunglowhung
committed
fix: clippy with error string display
1 parent 50941ab commit 6aa66de

File tree

6 files changed

+21
-30
lines changed

6 files changed

+21
-30
lines changed

‎common/src/address.rs‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,12 @@ pub struct ShelleyAddressPointer {
148148
serde::Deserialize,
149149
minicbor::Encode,
150150
minicbor::Decode,
151+
Default,
151152
)]
152153
pub enum ShelleyAddressDelegationPart {
153154
/// No delegation (enterprise addresses)
154155
#[n(0)]
156+
#[default]
155157
None,
156158

157159
/// Delegation to stake key
@@ -167,12 +169,6 @@ pub enum ShelleyAddressDelegationPart {
167169
Pointer(#[n(0)] ShelleyAddressPointer),
168170
}
169171

170-
impl Default for ShelleyAddressDelegationPart {
171-
fn default() -> Self {
172-
Self::None
173-
}
174-
}
175-
176172
/// A Shelley-era address
177173
#[derive(
178174
Debug,
@@ -619,20 +615,15 @@ impl Default for StakeAddress {
619615
}
620616

621617
/// A Cardano address
622-
#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
618+
#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, Default)]
623619
pub enum Address {
620+
#[default]
624621
None,
625622
Byron(ByronAddress),
626623
Shelley(ShelleyAddress),
627624
Stake(StakeAddress),
628625
}
629626

630-
impl Default for Address {
631-
fn default() -> Self {
632-
Self::None
633-
}
634-
}
635-
636627
impl Address {
637628
/// Get the stake pointer if there is one
638629
pub fn get_pointer(&self) -> Option<ShelleyAddressPointer> {

‎modules/chain_store/src/chain_store.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl ChainStore {
166166
BlocksStateQuery::GetBlockInfo { block_key } => {
167167
let Some(block) = Self::get_block_by_key(store, block_key)? else {
168168
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
169-
&format!("Block {:?} not found", block_key),
169+
format!("Block {:?} not found", block_key),
170170
)));
171171
};
172172
let info = Self::to_block_info(block, store, state, false)?;
@@ -175,7 +175,7 @@ impl ChainStore {
175175
BlocksStateQuery::GetBlockBySlot { slot } => {
176176
let Some(block) = store.get_block_by_slot(*slot)? else {
177177
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
178-
&format!("Block at slot {} not found", slot),
178+
format!("Block at slot {} not found", slot),
179179
)));
180180
};
181181
let info = Self::to_block_info(block, store, state, false)?;
@@ -184,7 +184,7 @@ impl ChainStore {
184184
BlocksStateQuery::GetBlockByEpochSlot { epoch, slot } => {
185185
let Some(block) = store.get_block_by_epoch_slot(*epoch, *slot)? else {
186186
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
187-
&format!("Block at epoch {} slot {} not found", epoch, slot),
187+
format!("Block at epoch {} slot {} not found", epoch, slot),
188188
)));
189189
};
190190
let info = Self::to_block_info(block, store, state, false)?;
@@ -202,7 +202,7 @@ impl ChainStore {
202202
}
203203
let Some(block) = Self::get_block_by_key(store, block_key)? else {
204204
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
205-
&format!("Block {:?} not found", block_key),
205+
format!("Block {:?} not found", block_key),
206206
)));
207207
};
208208
let number = match block_key {
@@ -229,7 +229,7 @@ impl ChainStore {
229229
}
230230
let Some(block) = Self::get_block_by_key(store, block_key)? else {
231231
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
232-
&format!("Block {:?} not found", block_key),
232+
format!("Block {:?} not found", block_key),
233233
)));
234234
};
235235
let number = match block_key {
@@ -256,7 +256,7 @@ impl ChainStore {
256256
} => {
257257
let Some(block) = Self::get_block_by_key(store, block_key)? else {
258258
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
259-
&format!("Block {:?} not found", block_key),
259+
format!("Block {:?} not found", block_key),
260260
)));
261261
};
262262
let txs = Self::to_block_transactions(block, limit, skip, order)?;
@@ -270,7 +270,7 @@ impl ChainStore {
270270
} => {
271271
let Some(block) = Self::get_block_by_key(store, block_key)? else {
272272
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
273-
&format!("Block {:?} not found", block_key),
273+
format!("Block {:?} not found", block_key),
274274
)));
275275
};
276276
let txs = Self::to_block_transactions_cbor(block, limit, skip, order)?;
@@ -283,7 +283,7 @@ impl ChainStore {
283283
} => {
284284
let Some(block) = Self::get_block_by_key(store, block_key)? else {
285285
return Ok(BlocksStateQueryResponse::Error(QueryError::not_found(
286-
&format!("Block {:?} not found", block_key),
286+
format!("Block {:?} not found", block_key),
287287
)));
288288
};
289289
let addresses = Self::to_block_involved_addresses(block, limit, skip)?;

‎modules/rest_blockfrost/src/handlers/addresses.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub async fn handle_address_single_blockfrost(
7272

7373
Message::StateQueryResponse(StateQueryResponse::UTxOs(
7474
UTxOStateQueryResponse::Error(e),
75-
)) => Err(e.into()),
75+
)) => Err(e),
7676
_ => Err(QueryError::internal_error(
7777
"Unexpected response from addresses query",
7878
)),
@@ -118,7 +118,7 @@ pub async fn handle_address_single_blockfrost(
118118
)) => Ok(balance),
119119
Message::StateQueryResponse(StateQueryResponse::UTxOs(
120120
UTxOStateQueryResponse::Error(e),
121-
)) => Err(e.into()),
121+
)) => Err(e),
122122
_ => Err(QueryError::internal_error(
123123
"Unexpected response querying UTxOs",
124124
)),

‎modules/rest_blockfrost/src/handlers/epochs.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pub async fn handle_epoch_info_blockfrost(
114114
Message::StateQueryResponse(StateQueryResponse::SPDD(
115115
SPDDStateQueryResponse::Error(e),
116116
)) => Err(e),
117-
_ => Err(QueryError::internal_error(&format!(
117+
_ => Err(QueryError::internal_error(format!(
118118
"Unexpected message type while retrieving total active stakes for epoch: {}",
119119
epoch_number
120120
))),

‎modules/spo_state/src/spo_state.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ impl SPOState {
514514
// for BF's compatibility
515515
PoolsStateQuery::GetPoolInfo { pool_id } => match state.get(pool_id) {
516516
Some(pool) => PoolsStateQueryResponse::PoolInfo(pool.clone()),
517-
None => PoolsStateQueryResponse::Error(QueryError::not_found(&format!(
517+
None => PoolsStateQueryResponse::Error(QueryError::not_found(format!(
518518
"Pool {}",
519519
pool_id
520520
))),
@@ -610,7 +610,7 @@ impl SPOState {
610610
if let Some(pool_metadata) = pool_metadata {
611611
PoolsStateQueryResponse::PoolMetadata(pool_metadata)
612612
} else {
613-
PoolsStateQueryResponse::Error(QueryError::not_found(&format!(
613+
PoolsStateQueryResponse::Error(QueryError::not_found(format!(
614614
"Pool metadata for {}",
615615
pool_id
616616
)))
@@ -622,7 +622,7 @@ impl SPOState {
622622
if let Some(relays) = pool_relays {
623623
PoolsStateQueryResponse::PoolRelays(relays)
624624
} else {
625-
PoolsStateQueryResponse::Error(QueryError::not_found(&format!(
625+
PoolsStateQueryResponse::Error(QueryError::not_found(format!(
626626
"Pool relays for {}",
627627
pool_id
628628
)))
@@ -639,7 +639,7 @@ impl SPOState {
639639
delegators: pool_delegators,
640640
})
641641
} else {
642-
PoolsStateQueryResponse::Error(QueryError::not_found(&format!(
642+
PoolsStateQueryResponse::Error(QueryError::not_found(format!(
643643
"Pool delegators for {}",
644644
pool_id
645645
)))
@@ -689,7 +689,7 @@ impl SPOState {
689689
if let Some(pool_updates) = pool_updates {
690690
PoolsStateQueryResponse::PoolUpdates(pool_updates)
691691
} else {
692-
PoolsStateQueryResponse::Error(QueryError::not_found(&format!(
692+
PoolsStateQueryResponse::Error(QueryError::not_found(format!(
693693
"Pool updates for {}",
694694
pool_id
695695
)))

‎modules/utxo_state/src/utxo_state.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl UTXOState {
125125
match state.get_utxos_sum(utxo_identifiers).await {
126126
Ok(balance) => UTxOStateQueryResponse::UTxOsSum(balance),
127127
Err(e) => UTxOStateQueryResponse::Error(QueryError::internal_error(
128-
format!("Fetching UTxO sum failed: {}", e.to_string()),
128+
format!("Fetching UTxO sum failed: {e}"),
129129
)),
130130
}
131131
}

0 commit comments

Comments
 (0)