This repository was archived by the owner on Jan 22, 2025. It is now read-only.
File tree 3 files changed +5
-7
lines changed
3 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -183,7 +183,7 @@ impl ShredDataTrait for ShredData {
183
183
}
184
184
self . payload
185
185
. get ( SHRED_DATA_OFFSET ..size)
186
- . ok_or_else ( || Error :: InvalidPayloadSize ( self . payload . len ( ) ) )
186
+ . ok_or ( Error :: InvalidPayloadSize ( self . payload . len ( ) ) )
187
187
}
188
188
189
189
// Only for tests.
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ impl ShredData {
75
75
+ SIZE_OF_MERKLE_ROOT
76
76
+ usize:: from ( proof_size) * SIZE_OF_MERKLE_PROOF_ENTRY ,
77
77
)
78
- . ok_or_else ( || Error :: InvalidProofSize ( proof_size) )
78
+ . ok_or ( Error :: InvalidProofSize ( proof_size) )
79
79
}
80
80
}
81
81
@@ -97,7 +97,7 @@ impl ShredCode {
97
97
+ SIZE_OF_MERKLE_ROOT
98
98
+ SIZE_OF_MERKLE_PROOF_ENTRY * usize:: from ( proof_size) ,
99
99
)
100
- . ok_or_else ( || Error :: InvalidProofSize ( proof_size) )
100
+ . ok_or ( Error :: InvalidProofSize ( proof_size) )
101
101
}
102
102
}
103
103
@@ -274,7 +274,7 @@ impl ShredDataTrait for ShredData {
274
274
}
275
275
self . payload
276
276
. get ( SHRED_DATA_OFFSET ..size)
277
- . ok_or_else ( || Error :: InvalidPayloadSize ( self . payload . len ( ) ) )
277
+ . ok_or ( Error :: InvalidPayloadSize ( self . payload . len ( ) ) )
278
278
}
279
279
280
280
// Only for tests.
Original file line number Diff line number Diff line change @@ -84,9 +84,7 @@ impl ShredData {
84
84
// Possibly zero pads bytes stored in blockstore.
85
85
pub ( crate ) fn resize_stored_shred ( shred : Vec < u8 > ) -> Result < Vec < u8 > , Error > {
86
86
match Shred :: shred_variant_from_payload ( & shred) ? {
87
- ShredVariant :: LegacyCode | ShredVariant :: MerkleCode ( _) => {
88
- return Err ( Error :: InvalidShredType ) ;
89
- }
87
+ ShredVariant :: LegacyCode | ShredVariant :: MerkleCode ( _) => Err ( Error :: InvalidShredType ) ,
90
88
ShredVariant :: MerkleData ( _) => {
91
89
if shred. len ( ) != merkle:: ShredData :: SIZE_OF_PAYLOAD {
92
90
return Err ( Error :: InvalidPayloadSize ( shred. len ( ) ) ) ;
You can’t perform that action at this time.
0 commit comments