fixup! 19581f3

Author: f3r10

simln-lib/src/lib.rs

@@ -1091,7 +1091,7 @@ impl<C: Clock + 'static> Simulation<C> {
             select! {
                 biased;
                 _ = listener.clone()  => {
-                    return Ok(())
+                    return Ok::<(), SimulationError>(())
                 },
                 _ = async {} => {
                     match heap.pop() {
@@ -1121,23 +1121,14 @@ impl<C: Clock + 'static> Simulation<C> {
                             // Only proceed with a payment if the amount is non-zero, otherwise skip this round. If we can't get
                             // a payment amount something has gone wrong (because we should have validated that we can always
                             // generate amounts), so we exit.
-                            let payment_amount = payload.executor.payment_generator.payment_amount(capacity);
-                            let amount = match payment_amount {
-                                Ok(amt) => {
-                                    if amt == 0 {
-                                        log::debug!(
-                                            "Skipping zero amount payment for {source} -> {}.", destination
-                                        );
-                                        generate_payment(&mut heap, pubkey, payload.current_count, &mut payment_event_payloads).await?;
-                                        continue;
-                                    }
-                                    amt
-                                },
-                                Err(e) => {
-                                    return Err(SimulationError::PaymentGenerationError(e));
-                                },
-                            };
+                            let amount = payload.executor.payment_generator.payment_amount(capacity).map_err(SimulationError::PaymentGenerationError)?;
                             generate_payment(&mut heap, pubkey, payload.current_count + 1, &mut payment_event_payloads).await?;
+                            if amount == 0 {
+                                log::debug!(
+                                    "Skipping zero amount payment for {source} -> {}.", destination
+                                );
+                                continue;
+                            }
 
                             // Wait until our time to next payment has elapsed then execute a random amount payment to a random
                             // destination.