From 45d697ec31beb8b628598adba21f8bac5fbdd0e8 Mon Sep 17 00:00:00 2001
From: Patrick Mylund Nielsen <patrick@patrickmn.com>
Date: Fri, 2 Dec 2016 10:27:39 -0500
Subject: [PATCH] internal/ethapi/api: In GetQuorumPayload, return error if
 PrivateTransactionManager is not enabled (rather than panic)

---
 internal/ethapi/api.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index c698d4cf3..bb37fa61b 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -467,21 +467,21 @@ func (s *PublicBlockChainAPI) GetUncleCountByBlockHash(ctx context.Context, bloc
 
 // GetQuorumPayload returns the contents of a private transaction
 func (s *PublicBlockChainAPI) GetQuorumPayload(digestHex string) (string, error) {
-        if private.P == nil {
-                panic("PublicBlockChainApi.GetQuorumPayload: PrivateTransactionManager is not enabled")
-        }
-        b, err := hex.DecodeString(digestHex)
-        if err != nil {
-                return "", err
-        }
-        if len(b) != 64 {
-                return "", fmt.Errorf("Expected a Quorum digest of length 64, but got %d", len(b))
-        }
-        data, err := private.P.Receive(b)
-        if err != nil {
-                return "", err
-        }
-        return fmt.Sprintf("0x%x", data), nil
+	if private.P == nil {
+		return "", fmt.Errorf("PrivateTransactionManager is not enabled")
+	}
+	b, err := hex.DecodeString(digestHex)
+	if err != nil {
+		return "", err
+	}
+	if len(b) != 64 {
+		return "", fmt.Errorf("Expected a Quorum digest of length 64, but got %d", len(b))
+	}
+	data, err := private.P.Receive(b)
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf("0x%x", data), nil
 }
 
 // GetCode returns the code stored at the given address in the state for the given block number.