kvserver: use require package for brevity

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/client_merge_test.go

@@ -3852,11 +3852,7 @@ func TestStoreRangeMergeRaftSnapshot(t *testing.T) {
 			// NOTE: There are no range-local keys or lock table keys, in [d,
 			// /Max) in the store we're sending a snapshot to, so we aren't
 			// expecting SSTs to clear those keys.
-			expectedSSTCount := 9
-			if len(sstNames) != expectedSSTCount {
-				return errors.Errorf("expected to ingest %d SSTs, got %d SSTs",
-					expectedSSTCount, len(sstNames))
-			}
+			require.Len(t, sstNames, 9)
 
 			// Only try to predict SSTs for:
 			// - The user keys in the snapshot
@@ -3900,11 +3896,11 @@ func TestStoreRangeMergeRaftSnapshot(t *testing.T) {
 				file := &storage.MemObject{}
 				writer := storage.MakeIngestionSSTWriter(ctx, st, file)
 				if i < len(keySpans)-1 {
-					// The last span is the MVCC span, and is always cleared via
-					// Excise. See MultiSSTWriter.
-					if err := writer.ClearRawRange(span.Key, span.EndKey, true /* pointKeys */, true /* rangeKeys */); err != nil {
-						return err
-					}
+					// The last span is the MVCC span, and is always cleared via Excise.
+					// See MultiSSTWriter.
+					require.NoError(t, writer.ClearRawRange(
+						span.Key, span.EndKey, true /* pointKeys */, true, /* rangeKeys */
+					))
 				}
 				sstFileWriters[string(span.Key)] = sstFileWriter{
 					span:   span,
@@ -3913,7 +3909,7 @@ func TestStoreRangeMergeRaftSnapshot(t *testing.T) {
 				}
 			}
 
-			if err := rditer.IterateReplicaKeySpans(ctx, inSnap.Desc, snapReader, rditer.SelectOpts{
+			require.NoError(t, rditer.IterateReplicaKeySpans(ctx, inSnap.Desc, snapReader, rditer.SelectOpts{
 				Ranged: rditer.SelectRangedOptions{
 					SystemKeys: true,
 					LockTable:  true,
@@ -3923,43 +3919,27 @@ func TestStoreRangeMergeRaftSnapshot(t *testing.T) {
 				UnreplicatedByRangeID: false,
 			}, func(iter storage.EngineIterator, span roachpb.Span) error {
 				fw, ok := sstFileWriters[string(span.Key)]
-				if !ok || !fw.span.Equal(span) {
-					return errors.Errorf("unexpected span %s", span)
-				}
+				require.True(t, ok)
+				require.Truef(t, fw.span.Equal(span), "unexpected span %s", span)
 				var err error
 				for ok := true; ok && err == nil; ok, err = iter.NextEngineKey() {
-					var key storage.EngineKey
-					if key, err = iter.UnsafeEngineKey(); err != nil {
-						return err
-					}
+					key, err := iter.UnsafeEngineKey()
+					require.NoError(t, err)
 					v, err := iter.UnsafeValue()
-					if err != nil {
-						return err
-					}
-					if err := fw.writer.PutEngineKey(key, v); err != nil {
-						return err
-					}
-				}
-				if err != nil {
-					return err
+					require.NoError(t, err)
+					require.NoError(t, fw.writer.PutEngineKey(key, v))
 				}
+				require.NoError(t, err)
 				return nil
-			}); err != nil {
-				return err
-			}
+			}))
 
 			for _, span := range keySpans {
 				fw := sstFileWriters[string(span.Key)]
-				if err := fw.writer.Finish(); err != nil {
-					return err
-				}
+				require.NoError(t, fw.writer.Finish())
 				expectedSSTs = append(expectedSSTs, fw.file.Data())
 			}
 
-			if len(expectedSSTs) != 5 {
-				return errors.Errorf("len of expectedSSTs should expected to be %d, but got %d",
-					5, len(expectedSSTs))
-			}
+			require.Len(t, expectedSSTs, 5)
 			// Keep the last one which contains the user keys.
 			expectedSSTs = expectedSSTs[len(expectedSSTs)-1:]
 
@@ -3998,15 +3978,11 @@ func TestStoreRangeMergeRaftSnapshot(t *testing.T) {
 					require.NoError(t, sst.ClearRawRange(keys.RaftHardStateKey(rangeID), s.EndKey, true, false))
 				}
 
-				if err := kvstorage.MakeStateLoader(rangeID).SetRangeTombstone(
+				require.NoError(t, kvstorage.MakeStateLoader(rangeID).SetRangeTombstone(
 					context.Background(), &sst,
 					kvserverpb.RangeTombstone{NextReplicaID: math.MaxInt32},
-				); err != nil {
-					return err
-				}
-				if err := sst.Finish(); err != nil {
-					return err
-				}
+				))
+				require.NoError(t, sst.Finish())
 				expectedSSTs = append(expectedSSTs, sstFile.Data())
 			}
 
@@ -4018,23 +3994,18 @@ func TestStoreRangeMergeRaftSnapshot(t *testing.T) {
 				StartKey: roachpb.RKey(keyD),
 				EndKey:   roachpb.RKey(keyEnd),
 			}
-			if err := storage.ClearRangeWithHeuristic(
+			require.NoError(t, storage.ClearRangeWithHeuristic(
 				ctx, receivingEng, &sst, desc.StartKey.AsRawKey(), desc.EndKey.AsRawKey(), 64,
-			); err != nil {
-				return err
-			} else if err := sst.Finish(); err != nil {
-				return err
-			}
+			))
+			require.NoError(t, sst.Finish())
 			expectedSSTs = append(expectedSSTs, sstFile.Data())
 
 			// Iterate over all the tested SSTs and check that they're
 			// byte-by-byte equal.
 			var dumpDir string
 			for i := range sstNamesSubset {
 				actualSST, err := fs.ReadFile(receivingEng.Env(), sstNamesSubset[i])
-				if err != nil {
-					return err
-				}
+				require.NoError(t, err)
 				if !bytes.Equal(expectedSSTs[i], actualSST) { // intentionally not printing
 					t.Logf("%d=%s", i, sstNamesSubset[i])
 					if dumpDir == "" {