Return nil instead of &trillian.LogLeaf{} when there is an err

trillian/ctfe/services.go

@@ -115,23 +115,23 @@ func (s *issuanceChainService) BuildLogLeaf(ctx context.Context, chain []*x509.C
 	if s.isCTFEStorageEnabled() {
 		issuanceChain, err := asn1.Marshal(raw[1:])
 		if err != nil {
-			return &trillian.LogLeaf{}, fmt.Errorf("failed to marshal issuance chain: %s", err)
+			return nil, fmt.Errorf("failed to marshal issuance chain: %s", err)
 		}
 		hash, err := s.add(ctx, issuanceChain)
 		if err != nil {
-			return &trillian.LogLeaf{}, fmt.Errorf("failed to add issuance chain into CTFE storage: %s", err)
+			return nil, fmt.Errorf("failed to add issuance chain into CTFE storage: %s", err)
 		}
 		leaf, err := util.BuildLogLeafWithChainHash(logPrefix, *merkleLeaf, 0, raw[0], hash, isPrecert)
 		if err != nil {
-			return &trillian.LogLeaf{}, fmt.Errorf("failed to build LogLeaf: %s", err)
+			return nil, fmt.Errorf("failed to build LogLeaf: %s", err)
 		}
 		return leaf, nil
 	}
 
 	// Trillian gRPC
 	leaf, err := util.BuildLogLeaf(logPrefix, *merkleLeaf, 0, raw[0], raw[1:], isPrecert)
 	if err != nil {
-		return &trillian.LogLeaf{}, fmt.Errorf("failed to build LogLeaf: %s", err)
+		return nil, fmt.Errorf("failed to build LogLeaf: %s", err)
 	}
 	return leaf, nil
 

trillian/util/log_leaf.go

@@ -86,7 +86,7 @@ func buildLogLeaf(logPrefix string, merkleLeaf ct.MerkleTreeLeaf, leafIndex int6
 	leafData, err := tls.Marshal(merkleLeaf)
 	if err != nil {
 		klog.Warningf("%s: Failed to serialize Merkle leaf: %v", logPrefix, err)
-		return &trillian.LogLeaf{}, err
+		return nil, err
 	}
 
 	var extraData []byte
@@ -97,7 +97,7 @@ func buildLogLeaf(logPrefix string, merkleLeaf ct.MerkleTreeLeaf, leafIndex int6
 	}
 	if err != nil {
 		klog.Warningf("%s: Failed to serialize chain for ExtraData: %v", logPrefix, err)
-		return &trillian.LogLeaf{}, err
+		return nil, err
 	}
 	// leafIDHash allows Trillian to detect duplicate entries, so this should be
 	// a hash over the cert data.