chore: rebase on main

Signed-off-by: etorreborre <etorreborre@yahoo.com>

Author: etorreborre

simulation/amaru-sim/src/simulator/args.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use amaru_kernel::HeaderHash;
 use amaru_consensus::consensus::headers_tree::data_generation::Ratio;
 use clap::Parser;
 use std::str::FromStr;

simulation/amaru-sim/src/sync/chain_sync_message.rs

@@ -16,8 +16,8 @@ use crate::echo::Envelope;
 use crate::simulator::bytes::Bytes;
 use amaru_consensus::consensus::events::ChainSyncEvent;
 use amaru_kernel::peer::Peer;
-use amaru_kernel::{Point, cbor};
-use amaru_ouroboros_traits::{BlockHeader, HeaderHash};
+use amaru_kernel::{HeaderHash, Point, cbor};
+use amaru_ouroboros_traits::BlockHeader;
 use amaru_slot_arithmetic::Slot;
 use gasket::framework::WorkerError;
 use pallas_primitives::babbage::{Header, MintedHeader};