fix range proof verification case

x/merkledb/proof.go

@@ -293,7 +293,7 @@ func (proof *RangeProof) Verify(
 		return ErrUnexpectedEndProof
 	case end.IsNothing() && len(proof.KeyValues) == 0 && len(proof.StartProof) == 0 && len(proof.EndProof) != 1:
 		return ErrShouldJustBeRoot
-	case end.HasValue() && len(proof.KeyValues) == 0 && len(proof.EndProof) == 0:
+	case len(proof.EndProof) == 0 && (end.HasValue() || len(proof.KeyValues) > 0):
 		return ErrNoEndProof
 	}
 

x/merkledb/proof_test.go

@@ -348,14 +348,23 @@ func Test_RangeProof_Syntactic_Verify(t *testing.T) {
 			expectedErr: ErrShouldJustBeRoot,
 		},
 		{
-			name:  "no end proof",
+			name:  "no end proof; has end bound",
 			start: []byte{1},
 			end:   maybe.Some([]byte{1}),
 			proof: &RangeProof{
 				StartProof: []ProofNode{{}},
 			},
 			expectedErr: ErrNoEndProof,
 		},
+		{
+			name:  "no end proof; has key-values",
+			start: []byte{1},
+			end:   maybe.Nothing[[]byte](),
+			proof: &RangeProof{
+				KeyValues: []KeyValue{{}},
+			},
+			expectedErr: ErrNoEndProof,
+		},
 		{
 			name:  "unsorted key values",
 			start: []byte{1},
@@ -365,6 +374,7 @@ func Test_RangeProof_Syntactic_Verify(t *testing.T) {
 					{Key: []byte{1}, Value: []byte{1}},
 					{Key: []byte{0}, Value: []byte{0}},
 				},
+				EndProof: []ProofNode{{}},
 			},
 			expectedErr: ErrNonIncreasingValues,
 		},
@@ -376,6 +386,7 @@ func Test_RangeProof_Syntactic_Verify(t *testing.T) {
 				KeyValues: []KeyValue{
 					{Key: []byte{0}, Value: []byte{0}},
 				},
+				EndProof: []ProofNode{{}},
 			},
 			expectedErr: ErrStateFromOutsideOfRange,
 		},
@@ -407,6 +418,7 @@ func Test_RangeProof_Syntactic_Verify(t *testing.T) {
 						KeyPath: newPath([]byte{1}).Serialize(),
 					},
 				},
+				EndProof: []ProofNode{{}},
 			},
 			expectedErr: ErrProofNodeNotForKey,
 		},
@@ -429,6 +441,7 @@ func Test_RangeProof_Syntactic_Verify(t *testing.T) {
 						KeyPath: newPath([]byte{1, 2, 3, 4}).Serialize(),
 					},
 				},
+				EndProof: []ProofNode{{}},
 			},
 			expectedErr: ErrProofNodeNotForKey,
 		},

x/sync/client_test.go

@@ -295,7 +295,7 @@ func TestGetRangeProof(t *testing.T) {
 			},
 			expectedErr: merkledb.ErrInvalidProof,
 		},
-		"all proof keys removed from response": {
+		"start and end proof nodes removed": {
 			db: largeTrieDB,
 			request: &pb.SyncGetRangeProofRequest{
 				RootHash:   largeTrieRoot[:],
@@ -306,7 +306,33 @@ func TestGetRangeProof(t *testing.T) {
 				response.StartProof = nil
 				response.EndProof = nil
 			},
-			expectedErr: merkledb.ErrInvalidProof,
+			expectedErr: merkledb.ErrNoEndProof,
+		},
+		"end proof nodes removed": {
+			db: largeTrieDB,
+			request: &pb.SyncGetRangeProofRequest{
+				RootHash:   largeTrieRoot[:],
+				KeyLimit:   defaultRequestKeyLimit,
+				BytesLimit: defaultRequestByteSizeLimit,
+			},
+			modifyResponse: func(response *merkledb.RangeProof) {
+				response.EndProof = nil
+			},
+			expectedErr: merkledb.ErrNoEndProof,
+		},
+		"empty proof": {
+			db: largeTrieDB,
+			request: &pb.SyncGetRangeProofRequest{
+				RootHash:   largeTrieRoot[:],
+				KeyLimit:   defaultRequestKeyLimit,
+				BytesLimit: defaultRequestByteSizeLimit,
+			},
+			modifyResponse: func(response *merkledb.RangeProof) {
+				response.KeyValues = nil
+				response.StartProof = nil
+				response.EndProof = nil
+			},
+			expectedErr: merkledb.ErrNoMerkleProof,
 		},
 	}