From eba868ff0088c2d28810c0b5328327ab6dc4fda9 Mon Sep 17 00:00:00 2001
From: Rob Mulholand <rmulholand@8thlight.com>
Date: Fri, 18 Oct 2019 10:24:33 -0500
Subject: [PATCH] Drop else when if statement includes return

---
 libraries/shared/logs/extractor.go | 3 +--
 pkg/eth/client/rpc_client.go       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/shared/logs/extractor.go b/libraries/shared/logs/extractor.go
index bbd769c2..11d25445 100644
--- a/libraries/shared/logs/extractor.go
+++ b/libraries/shared/logs/extractor.go
@@ -130,9 +130,8 @@ func logError(description string, err error, header core.Header) {
 func getCheckCount(recheckHeaders constants.TransformerExecution) int64 {
 	if recheckHeaders == constants.HeaderUnchecked {
 		return 1
-	} else {
-		return constants.RecheckHeaderCap
 	}
+	return constants.RecheckHeaderCap
 }
 
 func (extractor *LogExtractor) updateCheckedHeaders(config transformer.EventTransformerConfig) error {
diff --git a/pkg/eth/client/rpc_client.go b/pkg/eth/client/rpc_client.go
index d6f6a738..837de9ed 100644
--- a/pkg/eth/client/rpc_client.go
+++ b/pkg/eth/client/rpc_client.go
@@ -49,9 +49,8 @@ func (client RpcClient) CallContext(ctx context.Context, result interface{}, met
 	//Ganache however does not ignore it, and throws an 'Incorrect number of arguments' error.
 	if args == nil {
 		return client.client.CallContext(ctx, result, method)
-	} else {
-		return client.client.CallContext(ctx, result, method, args...)
 	}
+	return client.client.CallContext(ctx, result, method, args...)
 }
 
 func (client RpcClient) IpcPath() string {