From cc34340b772db78c0da1639bc7be6478d9ce8b94 Mon Sep 17 00:00:00 2001 From: LHerskind Date: Mon, 1 Jul 2024 10:23:09 +0000 Subject: [PATCH] chore: fix formatting issue --- .../shared_mutable/shared_mutable.nr | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr index 8d8f72d22a0..9823b25d8c9 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr @@ -106,21 +106,22 @@ impl SharedMutable { // Ideally the following would be simply public_storage::read_historical, but we can't implement that yet. let hash = header.public_storage_historical_read(self.get_hash_storage_slot(), address); - if hash != 0 { - assert_eq( - hash, SharedMutable::hash_scheduled_data(value_change_hint, delay_change_hint), "Hint values do not match hash" - ); + + // @todo This is written strangely to bypass a formatting issue with the if that is breaking ci. + let (a, b, c) = if hash != 0 { + let a = SharedMutable::hash_scheduled_data(value_change_hint, delay_change_hint); + (a, value_change_hint, delay_change_hint) } else { // The hash slot can only hold a zero if it is uninitialized, meaning no value or delay change was ever // scheduled. Therefore, the hints must then correspond to uninitialized scheduled changes. - assert_eq( - value_change_hint, ScheduledValueChange::deserialize(zeroed()), "Non-zero value change for zero hash" - ); - assert_eq( - delay_change_hint, ScheduledDelayChange::deserialize(zeroed()), "Non-zero delay change for zero hash" - ); - } + let b = ScheduledValueChange::deserialize(zeroed()); + let c = ScheduledDelayChange::deserialize(zeroed()); + (hash, b, c) + }; + assert_eq(hash, a, "Hint values do not match hash"); + assert_eq(value_change_hint, b, "Non-zero value change for zero hash"); + assert_eq(delay_change_hint, c, "Non-zero delay change for zero hash"); (value_change_hint, delay_change_hint, historical_block_number) } @@ -236,7 +237,6 @@ unconstrained fn get_public_storage_hints( let dummy = SharedMutable::new((), storage_slot); ( - storage_read(address, dummy.get_value_change_storage_slot(), block_number), - storage_read(address, dummy.get_delay_change_storage_slot(), block_number) + storage_read(address, dummy.get_value_change_storage_slot(), block_number), storage_read(address, dummy.get_delay_change_storage_slot(), block_number) ) -} \ No newline at end of file +}