Fix wire PruningPointProof to be two-dimensional.

kaspanet · Sep 5, 2021 · 984aad7 · 984aad7
1 parent 667b6e9
commit 984aad7
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 30 deletions.
diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p.pb.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p.pb.go
diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p.proto b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p.proto
@@ -254,5 +254,9 @@ message RequestPruningPointProofMessage {
 }
 
 message PruningPointProofMessage {
+  repeated PruningPointProofHeaderArray headers = 1;
+}
+
+message PruningPointProofHeaderArray {
   repeated BlockHeader headers = 1;
 }
diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_proof.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_proof.go
@@ -14,12 +14,15 @@ func (x *KaspadMessage_PruningPointProof) toAppMessage() (appmessage.Message, er
 		return nil, errors.Wrapf(errorNil, "x.PruningPointProof is nil")
 	}
 
-	blockHeaders := make([]*appmessage.MsgBlockHeader, len(x.PruningPointProof.Headers))
-	for i, blockHeader := range x.PruningPointProof.Headers {
-		var err error
-		blockHeaders[i], err = blockHeader.toAppMessage()
-		if err != nil {
-			return nil, err
+	blockHeaders := make([][]*appmessage.MsgBlockHeader, len(x.PruningPointProof.Headers))
+	for i, blockHeaderArray := range x.PruningPointProof.Headers {
+		blockHeaders[i] = make([]*appmessage.MsgBlockHeader, len(blockHeaderArray.Headers))
+		for j, blockHeader := range blockHeaderArray.Headers {
+			var err error
+			blockHeaders[i][j], err = blockHeader.toAppMessage()
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 	return &appmessage.MsgPruningPointProof{
@@ -28,12 +31,15 @@ func (x *KaspadMessage_PruningPointProof) toAppMessage() (appmessage.Message, er
 }
 
 func (x *KaspadMessage_PruningPointProof) fromAppMessage(msgPruningPointProof *appmessage.MsgPruningPointProof) error {
-	blockHeaders := make([]*BlockHeader, len(msgPruningPointProof.Headers))
-	for i, blockHeader := range msgPruningPointProof.Headers {
-		blockHeaders[i] = &BlockHeader{}
-		err := blockHeaders[i].fromAppMessage(blockHeader)
-		if err != nil {
-			return err
+	blockHeaders := make([]*PruningPointProofHeaderArray, len(msgPruningPointProof.Headers))
+	for i, blockHeaderArray := range msgPruningPointProof.Headers {
+		blockHeaders[i] = &PruningPointProofHeaderArray{Headers: make([]*BlockHeader, len(blockHeaderArray))}
+		for j, blockHeader := range blockHeaderArray {
+			blockHeaders[i].Headers[j] = &BlockHeader{}
+			err := blockHeaders[i].Headers[j].fromAppMessage(blockHeader)
+			if err != nil {
+				return err
+			}
 		}
 	}