@@ -6,7 +6,8 @@ use database::NetworkDatabase;
66use indexmap:: IndexSet ;
77use openssl:: rsa:: Rsa ;
88use ssv_types:: {
9- Cluster , ClusterId , Operator , OperatorId , Share , ValidatorIndex , ValidatorMetadata , ENCRYPTED_KEY_LENGTH ,
9+ Cluster , ClusterId , Operator , OperatorId , Share , ValidatorIndex , ValidatorMetadata ,
10+ ENCRYPTED_KEY_LENGTH ,
1011} ;
1112use ssz:: Decode ;
1213use std:: { path:: Path , sync:: OnceLock } ;
@@ -131,7 +132,7 @@ fn fuzz_with_data(fuzz: FuzzData) {
131132 } ;
132133
133134 match action {
134- DbAction :: InsertValidator {
135+ DbAction :: InsertValidator {
135136 cluster_id,
136137 owner,
137138 fee_recipient,
@@ -192,33 +193,44 @@ fn fuzz_with_data(fuzz: FuzzData) {
192193 }
193194 DbAction :: InsertOperator { operator_id, owner } => {
194195 let operator = Operator {
195- id : OperatorId ( operator_id) ,
196- rsa_pubkey : rsa_key. clone ( ) ,
197- owner : Address :: from ( owner) ,
196+ id : OperatorId ( operator_id) ,
197+ rsa_pubkey : rsa_key. clone ( ) ,
198+ owner : Address :: from ( owner) ,
198199 } ;
199200 let _ = old. insert_operator ( & operator, & tx) ;
200201 }
201202 DbAction :: DeleteOperator { operator_id } => {
202203 let _ = old. delete_operator ( OperatorId ( operator_id) , & tx) ;
203204 }
204- DbAction :: UpdateFeeRecipient { owner, fee_recipient } => {
205- let _ = old. update_fee_recipient ( Address :: from ( owner) , Address :: from ( fee_recipient) , & tx) ;
205+ DbAction :: UpdateFeeRecipient {
206+ owner,
207+ fee_recipient,
208+ } => {
209+ let _ = old. update_fee_recipient (
210+ Address :: from ( owner) ,
211+ Address :: from ( fee_recipient) ,
212+ & tx,
213+ ) ;
206214 }
207- DbAction :: UpdateGraffiti { validator_pubkey, graffiti } => {
215+ DbAction :: UpdateGraffiti {
216+ validator_pubkey,
217+ graffiti,
218+ } => {
208219 if let Ok ( validator_pk) = PublicKeyBytes :: from_ssz_bytes ( & validator_pubkey) {
209220 let _ = old. update_graffiti ( & validator_pk, Graffiti ( graffiti) , & tx) ;
210221 } ;
211222 }
212- DbAction :: SetValidatorIndices { validator_pubkey, index } => {
223+ DbAction :: SetValidatorIndices {
224+ validator_pubkey,
225+ index,
226+ } => {
213227 if let Ok ( validator_pk) = PublicKeyBytes :: from_ssz_bytes ( & validator_pubkey) {
214228 if let Some ( idx) = index {
215229 let mut map = std:: collections:: HashMap :: new ( ) ;
216230 map. insert ( validator_pk, ValidatorIndex ( idx) ) ;
217231 let _ = old. set_validator_indices ( map) ;
218- continue ;
219232 } ;
220233 } ;
221-
222234 }
223235 }
224236
@@ -252,7 +264,6 @@ fn fuzz_with_data(fuzz: FuzzData) {
252264 "own clusters differ"
253265 ) ;
254266
255-
256267 // Compare validator indices
257268 assert_eq ! (
258269 old_state. validator_indices( ) ,
@@ -281,7 +292,7 @@ fn fuzz_with_data(fuzz: FuzzData) {
281292 let mut new_metadata_index = vec ! [ ] ;
282293 let mut old_metadata_public_key = vec ! [ ] ;
283294 let mut new_metadata_public_key = vec ! [ ] ;
284- for old in old_metadata {
295+ for old in old_metadata {
285296 old_metadata_cluster_id. push ( old. cluster_id ) ;
286297 old_metadata_graffiti. push ( old. graffiti ) ;
287298 old_metadata_index. push ( old. index ) ;
@@ -293,10 +304,22 @@ fn fuzz_with_data(fuzz: FuzzData) {
293304 new_metadata_index. push ( new. index ) ;
294305 new_metadata_public_key. push ( new. public_key ) ;
295306 }
296- assert_eq ! ( old_metadata_cluster_id, new_metadata_cluster_id, "validator metadata cluster_id differ" ) ;
297- assert_eq ! ( old_metadata_graffiti, new_metadata_graffiti, "validator metadata graffiti differ" ) ;
298- assert_eq ! ( old_metadata_index, new_metadata_index, "validator metadata index differ" ) ;
299- assert_eq ! ( old_metadata_public_key, new_metadata_public_key, "validator metadata public_key differ" ) ;
307+ assert_eq ! (
308+ old_metadata_cluster_id, new_metadata_cluster_id,
309+ "validator metadata cluster_id differ"
310+ ) ;
311+ assert_eq ! (
312+ old_metadata_graffiti, new_metadata_graffiti,
313+ "validator metadata graffiti differ"
314+ ) ;
315+ assert_eq ! (
316+ old_metadata_index, new_metadata_index,
317+ "validator metadata index differ"
318+ ) ;
319+ assert_eq ! (
320+ old_metadata_public_key, new_metadata_public_key,
321+ "validator metadata public_key differ"
322+ ) ;
300323
301324 // Compare Operators
302325 let mut old_ops: Vec < ( u64 , String , String ) > = Vec :: new ( ) ;
@@ -358,7 +381,6 @@ fn fuzz_with_data(fuzz: FuzzData) {
358381 }
359382 }
360383 }
361-
362384 let mut new_owners: Vec < ( String , u16 ) > = Vec :: new ( ) ;
363385 if let Ok ( conn) = new. connection ( ) {
364386 if let Ok ( mut stmt) = conn. prepare ( GET_ALL_NONCES ) {
@@ -377,9 +399,7 @@ fn fuzz_with_data(fuzz: FuzzData) {
377399 }
378400 }
379401 }
380-
381402 assert_eq ! ( old_owners, new_owners, "Owners in DB differ" ) ;
382-
383403}
384404
385405fn main ( ) {
@@ -390,4 +410,4 @@ fn main() {
390410 } ;
391411 fuzz_with_data( fuzz) ;
392412 } ) ;
393- }
413+ }
0 commit comments