Merge branch 'dev' into version-bump-v1.10.10

ava-labs · Sep 19, 2023 · 2f93bd1 · 2f93bd1
2 parents 2cadf70 + 856df85
commit 2f93bd1
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 96 deletions.
diff --git a/proto/pb/sync/sync.pb.go b/proto/pb/sync/sync.pb.go
diff --git a/proto/sync/sync.proto b/proto/sync/sync.proto
@@ -133,8 +133,8 @@ message ChangeProof {
 }
 
 message RangeProof {
-  repeated ProofNode start = 1;
-  repeated ProofNode end = 2;
+  repeated ProofNode start_proof = 1;
+  repeated ProofNode end_proof = 2;
   repeated KeyValue key_values = 3;
 }
 

diff --git a/x/merkledb/proof.go b/x/merkledb/proof.go
@@ -419,9 +419,9 @@ func (proof *RangeProof) ToProto() *pb.RangeProof {
 	}
 
 	return &pb.RangeProof{
-		Start:     startProof,
-		End:       endProof,
-		KeyValues: keyValues,
+		StartProof: startProof,
+		EndProof:   endProof,
+		KeyValues:  keyValues,
 	}
 }
 
@@ -430,15 +430,15 @@ func (proof *RangeProof) UnmarshalProto(pbProof *pb.RangeProof) error {
 		return ErrNilRangeProof
 	}
 
-	proof.StartProof = make([]ProofNode, len(pbProof.Start))
-	for i, protoNode := range pbProof.Start {
+	proof.StartProof = make([]ProofNode, len(pbProof.StartProof))
+	for i, protoNode := range pbProof.StartProof {
 		if err := proof.StartProof[i].UnmarshalProto(protoNode); err != nil {
 			return err
 		}
 	}
 
-	proof.EndProof = make([]ProofNode, len(pbProof.End))
-	for i, protoNode := range pbProof.End {
+	proof.EndProof = make([]ProofNode, len(pbProof.EndProof))
+	for i, protoNode := range pbProof.EndProof {
 		if err := proof.EndProof[i].UnmarshalProto(protoNode); err != nil {
 			return err
 		}

diff --git a/x/sync/g_db/db_server.go b/x/sync/g_db/db_server.go
@@ -171,16 +171,16 @@ func (s *DBServer) GetRangeProof(
 
 	protoProof := &pb.GetRangeProofResponse{
 		Proof: &pb.RangeProof{
-			Start:     make([]*pb.ProofNode, len(proof.StartProof)),
-			End:       make([]*pb.ProofNode, len(proof.EndProof)),
-			KeyValues: make([]*pb.KeyValue, len(proof.KeyValues)),
+			StartProof: make([]*pb.ProofNode, len(proof.StartProof)),
+			EndProof:   make([]*pb.ProofNode, len(proof.EndProof)),
+			KeyValues:  make([]*pb.KeyValue, len(proof.KeyValues)),
 		},
 	}
 	for i, node := range proof.StartProof {
-		protoProof.Proof.Start[i] = node.ToProto()
+		protoProof.Proof.StartProof[i] = node.ToProto()
 	}
 	for i, node := range proof.EndProof {
-		protoProof.Proof.End[i] = node.ToProto()
+		protoProof.Proof.EndProof[i] = node.ToProto()
 	}
 	for i, kv := range proof.KeyValues {
 		protoProof.Proof.KeyValues[i] = &pb.KeyValue{