deps: bump tm-db to 0.6.0 (#5058)

light/store/db/db.go

@@ -70,18 +70,22 @@ func (s *dbs) SaveSignedHeaderAndValidatorSet(sh *types.SignedHeader, valSet *ty
 	defer s.mtx.Unlock()
 
 	b := s.db.NewBatch()
-	b.Set(s.shKey(sh.Height), shBz)
-	b.Set(s.vsKey(sh.Height), valSetBz)
-	b.Set(sizeKey, marshalSize(s.size+1))
-
-	err = b.WriteSync()
-	b.Close()
-
-	if err == nil {
-		s.size++
+	defer b.Close()
+	if err = b.Set(s.shKey(sh.Height), shBz); err != nil {
+		return err
 	}
+	if err = b.Set(s.vsKey(sh.Height), valSetBz); err != nil {
+		return err
+	}
+	if err = b.Set(sizeKey, marshalSize(s.size+1)); err != nil {
+		return err
+	}
+	if err = b.WriteSync(); err != nil {
+		return err
+	}
+	s.size++
 
-	return err
+	return nil
 }
 
 // DeleteSignedHeaderAndValidatorSet deletes SignedHeader and ValidatorSet from
@@ -97,18 +101,22 @@ func (s *dbs) DeleteSignedHeaderAndValidatorSet(height int64) error {
 	defer s.mtx.Unlock()
 
 	b := s.db.NewBatch()
-	b.Delete(s.shKey(height))
-	b.Delete(s.vsKey(height))
-	b.Set(sizeKey, marshalSize(s.size-1))
-
-	err := b.WriteSync()
-	b.Close()
-
-	if err == nil {
-		s.size--
+	defer b.Close()
+	if err := b.Delete(s.shKey(height)); err != nil {
+		return err
 	}
+	if err := b.Delete(s.vsKey(height)); err != nil {
+		return err
+	}
+	if err := b.Set(sizeKey, marshalSize(s.size-1)); err != nil {
+		return err
+	}
+	if err := b.WriteSync(); err != nil {
+		return err
+	}
+	s.size--
 
-	return err
+	return nil
 }
 
 // SignedHeader loads SignedHeader at the given height.
@@ -193,7 +201,7 @@ func (s *dbs) LastSignedHeaderHeight() (int64, error) {
 		itr.Next()
 	}
 
-	return -1, nil
+	return -1, itr.Error()
 }
 
 // FirstSignedHeaderHeight returns the first SignedHeader height stored.
@@ -218,7 +226,7 @@ func (s *dbs) FirstSignedHeaderHeight() (int64, error) {
 		itr.Next()
 	}
 
-	return -1, nil
+	return -1, itr.Error()
 }
 
 // SignedHeaderBefore iterates over headers until it finds a header before
@@ -247,6 +255,9 @@ func (s *dbs) SignedHeaderBefore(height int64) (*types.SignedHeader, error) {
 		}
 		itr.Next()
 	}
+	if err = itr.Error(); err != nil {
+		return nil, err
+	}
 
 	return nil, store.ErrSignedHeaderNotFound
 }
@@ -272,28 +283,34 @@ func (s *dbs) Prune(size uint16) error {
 		append(s.shKey(1<<63-1), byte(0x00)),
 	)
 	if err != nil {
-		panic(err)
+		return err
 	}
+	defer itr.Close()
 
 	b := s.db.NewBatch()
+	defer b.Close()
 
 	pruned := 0
 	for itr.Valid() && numToPrune > 0 {
 		key := itr.Key()
 		_, height, ok := parseShKey(key)
 		if ok {
-			b.Delete(s.shKey(height))
-			b.Delete(s.vsKey(height))
+			if err = b.Delete(s.shKey(height)); err != nil {
+				return err
+			}
+			if err = b.Delete(s.vsKey(height)); err != nil {
+				return err
+			}
 		}
 		itr.Next()
 		numToPrune--
 		pruned++
 	}
-
-	itr.Close()
+	if err = itr.Error(); err != nil {
+		return err
+	}
 
 	err = b.WriteSync()
-	b.Close()
 	if err != nil {
 		return err
 	}