Simplify test helpers, take 2

Author: mkalinin

tests/core/pyspec/eth2spec/test/helpers/consolidations.py

@@ -5,9 +5,7 @@
 
 def prepare_switch_to_compounding_request(spec, state, validator_index, address=None):
     validator = state.validators[validator_index]
-
-    # Set the supplied address or the default one if needed
-    if address is not None or not spec.has_execution_withdrawal_credential(validator):
+    if not spec.has_execution_withdrawal_credential(validator):
         set_eth1_withdrawal_credential_with_balance(spec, state, validator_index, address=address)
 
     return spec.ConsolidationRequest(

tests/core/pyspec/eth2spec/test/helpers/withdrawals.py

@@ -140,9 +140,7 @@ def prepare_pending_withdrawal(spec, state, validator_index,
 
 def prepare_withdrawal_request(spec, state, validator_index, address=None, amount=None):
     validator = state.validators[validator_index]
-    
-    # Set the supplied address or the default one if needed
-    if address is not None or not spec.has_execution_withdrawal_credential(validator):
+    if not spec.has_execution_withdrawal_credential(validator):
         set_eth1_withdrawal_credential_with_balance(spec, state, validator_index, address=address)
 
     if amount is None: