Fix clippy warnings

e2e-tests/src/test/button_game/helpers.rs

@@ -74,12 +74,7 @@ pub(super) fn random_account() -> KeyPair {
 }
 
 /// Transfer `amount` from `from` to `to`
-pub(super) fn transfer<C: AnyConnection>(
-    conn: &C,
-    from: &KeyPair,
-    to: &KeyPair,
-    amount: Balance,
-) -> () {
+pub(super) fn transfer<C: AnyConnection>(conn: &C, from: &KeyPair, to: &KeyPair, amount: Balance) {
     aleph_client::balances_transfer(
         &SignedConnection::from_any_connection(conn, from.clone()),
         &to.public().into(),
@@ -114,9 +109,9 @@ pub(super) fn setup_button_test(
     let player = random_account();
 
     let button = Arc::new(ButtonInstance::new(config, button_contract_address)?);
-    let ticket_token = Arc::new(ticket_token(&conn, &button, &config)?);
-    let reward_token = Arc::new(reward_token(&conn, &button, &config)?);
-    let marketplace = Arc::new(marketplace(&conn, &button, &config)?);
+    let ticket_token = Arc::new(ticket_token(&conn, &button, config)?);
+    let reward_token = Arc::new(reward_token(&conn, &button, config)?);
+    let marketplace = Arc::new(marketplace(&conn, &button, config)?);
 
     let c1 = button.clone();
     let c2 = ticket_token.clone();
@@ -195,7 +190,7 @@ impl<T> BufferedReceiver<T> {
                     }
                 }
 
-                return Err(RecvTimeoutError::Timeout);
+                Err(RecvTimeoutError::Timeout)
             }
         }
     }
@@ -241,7 +236,7 @@ pub(super) fn assert_recv<T: Debug, F: Fn(&T) -> bool>(
 
 pub(super) fn refute_recv_id(events: &mut BufferedReceiver<Result<ContractEvent>>, id: &str) {
     if let Ok(event) = recv_timeout_with_log(events, |event| event.ident == Some(id.to_string())) {
-        assert!(false, "Received unexpected event {:?}", event);
+        panic!("Received unexpected event {:?}", event);
     }
 }
 
@@ -256,7 +251,7 @@ fn recv_timeout_with_log<T: Debug, F: Fn(&T) -> bool>(
             warn!("Contract event error {:?}", event_or_error);
         }
 
-        event_or_error.as_ref().map(|x| filter(x)).unwrap_or(false)
+        event_or_error.as_ref().map(&filter).unwrap_or(false)
     }) {
         Ok(event) => Ok(event.unwrap()),
         Err(err) => bail!(err),

e2e-tests/src/test/button_game/mod.rs

@@ -47,7 +47,7 @@ pub fn marketplace(config: &Config) -> Result<()> {
 
     let player_balance = 100 * later_price;
     reward_token.mint(
-        &sign(&conn, authority.clone()),
+        &sign(&conn, authority),
         &player.to_account(),
         player_balance,
     )?;
@@ -99,7 +99,7 @@ pub fn button_game_reset(config: &Config) -> Result<()> {
     ticket_token.transfer(&sign(&conn, authority.clone()), &button.to_account(), 1)?;
 
     wait_for_death(&conn, &button)?;
-    button.reset(&sign(&conn, authority.clone()))?;
+    button.reset(&sign(&conn, authority))?;
 
     let _ = assert_recv(
         &mut events,
@@ -153,7 +153,7 @@ pub fn the_pressiah_cometh(config: &Config) -> Result<()> {
     )
 }
 
-fn button_game_play<F: Fn(u128, u128) -> ()>(
+fn button_game_play<F: Fn(u128, u128)>(
     config: &Config,
     button_contract_address: &Option<String>,
     score_check: F,
@@ -196,7 +196,7 @@ fn button_game_play<F: Fn(u128, u128) -> ()>(
     assert!(reward_token.balance_of(&conn, &player.to_account())? == total_score);
 
     wait_for_death(&conn, &button)?;
-    button.reset(&sign(&conn, authority.clone()))?;
+    button.reset(&sign(&conn, authority))?;
     assert_recv_id(&mut events, "Reset");
 
     let pressiah_score = total_score / 4;