gitbase/repository_pool: move billyRepository to test file

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

fs_error_test.go

@@ -60,15 +60,15 @@ func setupErrorRepos(t *testing.T) (*sql.Context, CleanupFunc) {
 
 	fs, err := brokenFS(brokenPackfile, baseFS)
 	require.NoError(err)
-	pool.AddBilly("packfile", fs)
+	pool.Add(billyRepo("packfile", fs))
 
 	fs, err = brokenFS(brokenIndex, baseFS)
 	require.NoError(err)
-	pool.AddBilly("index", fs)
+	pool.Add(billyRepo("index", fs))
 
 	fs, err = brokenFS(0, baseFS)
 	require.NoError(err)
-	pool.AddBilly("ok", fs)
+	pool.Add(billyRepo("ok", fs))
 
 	session := NewSession(pool, WithSkipGitErrors(true))
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
@@ -141,6 +141,41 @@ func testTable(t *testing.T, tableName string, number int) {
 	}
 }
 
+type billyRepository struct {
+	id string
+	fs billy.Filesystem
+}
+
+func billyRepo(id string, fs billy.Filesystem) repository {
+	return &billyRepository{id, fs}
+}
+
+func (r *billyRepository) ID() string {
+	return r.id
+}
+
+func (r *billyRepository) Repo() (*Repository, error) {
+	storage, err := filesystem.NewStorage(r.fs)
+	if err != nil {
+		return nil, err
+	}
+
+	repo, err := git.Open(storage, r.fs)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewRepository(r.id, repo), nil
+}
+
+func (r *billyRepository) FS() (billy.Filesystem, error) {
+	return r.fs, nil
+}
+
+func (r *billyRepository) Path() string {
+	return r.id
+}
+
 type brokenType uint64
 
 const (

repository_pool.go

@@ -146,41 +146,6 @@ func (r *sivaRepository) Path() string {
 	return r.path
 }
 
-type billyRepository struct {
-	id string
-	fs billy.Filesystem
-}
-
-func billyRepo(id string, fs billy.Filesystem) repository {
-	return &billyRepository{id, fs}
-}
-
-func (r *billyRepository) ID() string {
-	return r.id
-}
-
-func (r *billyRepository) Repo() (*Repository, error) {
-	storage, err := filesystem.NewStorage(r.fs)
-	if err != nil {
-		return nil, err
-	}
-
-	repo, err := git.Open(storage, r.fs)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewRepository(r.id, repo), nil
-}
-
-func (r *billyRepository) FS() (billy.Filesystem, error) {
-	return r.fs, nil
-}
-
-func (r *billyRepository) Path() string {
-	return r.id
-}
-
 // RepositoryPool holds a pool git repository paths and
 // functionality to open and iterate them.
 type RepositoryPool struct {
@@ -304,11 +269,6 @@ func (p *RepositoryPool) addSivaFile(root, path string, f os.FileInfo) {
 	}
 }
 
-// AddBilly inserts a billy filesystem containing a git repo to the pool.
-func (p *RepositoryPool) AddBilly(id string, fs billy.Filesystem) error {
-	return p.Add(billyRepo(id, fs))
-}
-
 // GetPos retrieves a repository at a given position. If the position is
 // out of bounds it returns io.EOF.
 func (p *RepositoryPool) GetPos(pos int) (*Repository, error) {