From 8fb4edac8d4e4b97fd366abecbcbba563f3110f4 Mon Sep 17 00:00:00 2001
From: Ryan <ryanford@poluglottos.com>
Date: Mon, 18 Sep 2023 20:05:25 +0200
Subject: [PATCH] fix: replacing jsonProof with pb.Proof (#233)

jsonProof is not necessary when we already have pb.Proof, which caused
issues because of mismatching field names.

Related: https://github.com/celestiaorg/celestia-node/issues/2631
Specifically:
https://github.com/celestiaorg/celestia-node/issues/2631#issuecomment-1708048715
---
 proof.go | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/proof.go b/proof.go
index a6a6085..6bf877e 100644
--- a/proof.go
+++ b/proof.go
@@ -49,36 +49,28 @@ type Proof struct {
 	isMaxNamespaceIDIgnored bool
 }
 
-type jsonProof struct {
-	Start                   int      `json:"start"`
-	End                     int      `json:"end"`
-	Nodes                   [][]byte `json:"nodes"`
-	LeafHash                []byte   `json:"leaf_hash"`
-	IsMaxNamespaceIDIgnored bool     `json:"is_max_namespace_id_ignored"`
-}
-
 func (proof Proof) MarshalJSON() ([]byte, error) {
-	jsonProofObj := jsonProof{
-		Start:                   proof.start,
-		End:                     proof.end,
-		Nodes:                   proof.nodes,
-		LeafHash:                proof.leafHash,
-		IsMaxNamespaceIDIgnored: proof.isMaxNamespaceIDIgnored,
+	pbProofObj := pb.Proof{
+		Start:                 int64(proof.start),
+		End:                   int64(proof.end),
+		Nodes:                 proof.nodes,
+		LeafHash:              proof.leafHash,
+		IsMaxNamespaceIgnored: proof.isMaxNamespaceIDIgnored,
 	}
-	return json.Marshal(jsonProofObj)
+	return json.Marshal(pbProofObj)
 }
 
 func (proof *Proof) UnmarshalJSON(data []byte) error {
-	var jsonProofObj jsonProof
-	err := json.Unmarshal(data, &jsonProofObj)
+	var pbProof pb.Proof
+	err := json.Unmarshal(data, &pbProof)
 	if err != nil {
 		return err
 	}
-	proof.start = jsonProofObj.Start
-	proof.end = jsonProofObj.End
-	proof.nodes = jsonProofObj.Nodes
-	proof.leafHash = jsonProofObj.LeafHash
-	proof.isMaxNamespaceIDIgnored = jsonProofObj.IsMaxNamespaceIDIgnored
+	proof.start = int(pbProof.Start)
+	proof.end = int(pbProof.End)
+	proof.nodes = pbProof.Nodes
+	proof.leafHash = pbProof.LeafHash
+	proof.isMaxNamespaceIDIgnored = pbProof.IsMaxNamespaceIgnored
 	return nil
 }