all: Remove miscellaneous vestigial code (#7495)

lib/db/benchmark_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/syncthing/syncthing/lib/protocol"
 )
 
-var files, filesUpdated, oneFile, firstHalf, secondHalf, changed100, unchanged100 []protocol.FileInfo
+var files, oneFile, firstHalf, secondHalf, changed100, unchanged100 []protocol.FileInfo
 
 func lazyInitBenchFiles() {
 	if files != nil {

lib/db/schemaupdater.go

@@ -8,7 +8,6 @@ package db
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"sort"
 	"strings"
@@ -32,8 +31,6 @@ type migration struct {
 	migration           func(prevSchema int) error
 }
 
-var errFolderMissing = errors.New("folder present in global list but missing in keyer index")
-
 type databaseDowngradeError struct {
 	minSyncthingVersion string
 }

lib/db/structs.go

@@ -396,25 +396,6 @@ func (vl *VersionList) findDevice(device []byte) (bool, int, int, bool) {
 	return false, -1, -1, false
 }
 
-func (vl *VersionList) popVersion(version protocol.Vector) (FileVersion, bool) {
-	i := vl.versionIndex(version)
-	if i == -1 {
-		return FileVersion{}, false
-	}
-	fv := vl.RawVersions[i]
-	vl.popVersionAt(i)
-	return fv, true
-}
-
-func (vl *VersionList) versionIndex(version protocol.Vector) int {
-	for i, v := range vl.RawVersions {
-		if version.Equal(v.Version) {
-			return i
-		}
-	}
-	return -1
-}
-
 func (vl *VersionList) popVersionAt(i int) {
 	vl.RawVersions = append(vl.RawVersions[:i], vl.RawVersions[i+1:]...)
 }
@@ -496,14 +477,6 @@ func popDeviceAt(devices [][]byte, i int) [][]byte {
 	return append(devices[:i], devices[i+1:]...)
 }
 
-func popDevice(devices [][]byte, device []byte) ([][]byte, bool) {
-	i := deviceIndex(devices, device)
-	if i == -1 {
-		return devices, false
-	}
-	return popDeviceAt(devices, i), true
-}
-
 func newFileVersion(device []byte, version protocol.Vector, invalid, deleted bool) FileVersion {
 	fv := FileVersion{
 		Version: version,