Merge branch 'feat/gnosis-neth' of https://github.com/gnosischain/hive …

…into feat/gnosis-neth
gnosischain · Jul 18, 2023 · 7ed4802 · 7ed4802
2 parents ca82552 + 799f5f0
commit 7ed4802
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/simulators/eth2/common/builder/mock/options.go b/simulators/eth2/common/builder/mock/options.go
@@ -420,9 +420,8 @@ func genPayloadAttributesInvalidator(
 						pa.Withdrawals = pa.Withdrawals[1:]
 					}
 					return true, nil
-				} else {
-					return false, fmt.Errorf("unable to invalidate: no withdrawals")
 				}
+				return false, fmt.Errorf("unable to invalidate: no withdrawals")
 			case INVALIDATE_ATTR_EXTRA_WITHDRAWAL:
 				if pa.Withdrawals == nil {
 					pa.Withdrawals = make([]*types.Withdrawal, 0)

diff --git a/simulators/eth2/common/clients/beacon.go b/simulators/eth2/common/clients/beacon.go
@@ -110,10 +110,9 @@ func (bn *BeaconClient) Init(ctx context.Context) error {
 					if spec, err := SpecFromConfig(cfg); err != nil {
 						errs <- err
 						return
-					} else {
-						bn.Config.Spec = spec
-						return
 					}
+					bn.Config.Spec = spec
+					return
 				}
 				select {
 				case <-ctx.Done():
@@ -158,9 +157,9 @@ func (bn *BeaconClient) Init(ctx context.Context) error {
 func (bn *BeaconClient) Shutdown() error {
 	if managedClient, ok := bn.Client.(ManagedClient); !ok {
 		return fmt.Errorf("attempted to shutdown an unmanaged client")
-	} else {
-		return managedClient.Shutdown()
-	}
+	} 
+	return managedClient.Shutdown()
+
 }
 
 func (bn *BeaconClient) ENR(parentCtx context.Context) (string, error) {

diff --git a/simulators/eth2/common/clients/execution.go b/simulators/eth2/common/clients/execution.go
@@ -235,9 +235,8 @@ func (en *ExecutionClient) Init(ctx context.Context) error {
 func (en *ExecutionClient) Shutdown() error {
 	if managedClient, ok := en.Client.(ManagedClient); !ok {
 		return fmt.Errorf("attempted to shutdown an unmanaged client")
-	} else {
-		return managedClient.Shutdown()
 	}
+	return managedClient.Shutdown()
 }
 
 func (en *ExecutionClient) IsRunning() bool {