[FAB-2581] Fix if-else statements in deliver tests

https://jira.hyperledger.org/browse/FAB-2581

A set of if blocks end with return statements, meaning there's no reason
for a corresponding else block. This changeset addresses that.

Change-Id: I8a97bb3c232f6c174241bcc206e070fd5a9c2697
Signed-off-by: Kostas Christidis <kostas@christidis.io>

orderer/common/deliver/deliver.go

@@ -83,7 +83,7 @@ func (ds *deliverServer) Handle(srv ab.AtomicBroadcast_DeliverServer) error {
 		}
 
 		if payload.Header == nil /* || payload.Header.ChannelHeader == nil */ {
-			err := fmt.Errorf("Malformed envelope recieved with bad header")
+			err = fmt.Errorf("Malformed envelope received with bad header")
 			logger.Error(err)
 			return err
 		}

orderer/common/deliver/deliver_test.go

@@ -166,10 +166,9 @@ func TestOldestSeek(t *testing.T) {
 					t.Fatalf("Expected %d blocks but got %d", ledgerSize, count)
 				}
 				return
-			} else {
-				if deliverReply.GetBlock().Header.Number != count {
-					t.Fatalf("Expected block %d but got block %d", count, deliverReply.GetBlock().Header.Number)
-				}
+			}
+			if deliverReply.GetBlock().Header.Number != count {
+				t.Fatalf("Expected block %d but got block %d", count, deliverReply.GetBlock().Header.Number)
 			}
 		case <-time.After(time.Second):
 			t.Fatalf("Timed out waiting to get all blocks")
@@ -200,10 +199,9 @@ func TestNewestSeek(t *testing.T) {
 				t.Fatalf("Received an error on the reply channel")
 			}
 			return
-		} else {
-			if deliverReply.GetBlock().Header.Number != uint64(ledgerSize-1) {
-				t.Fatalf("Expected only the most recent block")
-			}
+		}
+		if deliverReply.GetBlock().Header.Number != uint64(ledgerSize-1) {
+			t.Fatalf("Expected only the most recent block")
 		}
 	case <-time.After(time.Second):
 		t.Fatalf("Timed out waiting to get all blocks")
@@ -236,10 +234,9 @@ func TestSpecificSeek(t *testing.T) {
 					t.Fatalf("Received an error on the reply channel")
 				}
 				return
-			} else {
-				if expected := specifiedStart + count; deliverReply.GetBlock().Header.Number != expected {
-					t.Fatalf("Expected block %d but got block %d", expected, deliverReply.GetBlock().Header.Number)
-				}
+			}
+			if expected := specifiedStart + count; deliverReply.GetBlock().Header.Number != expected {
+				t.Fatalf("Expected block %d but got block %d", expected, deliverReply.GetBlock().Header.Number)
 			}
 		case <-time.After(time.Second):
 			t.Fatalf("Timed out waiting to get all blocks")