Move args parsing out of repo cache

2 files changed, 5 insertions, 9 deletions

diff --git a/cache/repo_cache_bug.go b/cache/repo_cache_bug.go
index 0c26cb38..c7e2ed34 100644
--- a/cache/repo_cache_bug.go
+++ b/cache/repo_cache_bug.go
@@ -363,21 +363,17 @@ func (c *RepoCache) NewBugRaw(author *IdentityCache, unixTime int64, title strin
 // RemoveBug removes a bug from the cache and repo
 // args[0] specifies the bug prefix to remove
 // args[1] (if present) specifies the remote the bug was imported from
-func (c *RepoCache) RemoveBug(args []string) error {
-	if len(args) == 0 {
-		return fmt.Errorf("you must provide a bug prefix to remove")
-	}
-
-	b, err := c.ResolveBugPrefix(args[0])
+func (c *RepoCache) RemoveBug(prefix string, remote string) error {
+	b, err := c.ResolveBugPrefix(prefix)
 
 	if err != nil {
 		return err
 	}
 
-	if len(args) == 1 {
+	if remote == "" {
 		err = bug.RemoveLocalBug(c.repo, b.Id())
 	} else {
-		err = bug.RemoveRemoteBug(c.repo, args[1], b.Id())
+		err = bug.RemoveRemoteBug(c.repo, remote, b.Id())
 	}
 	if err != nil {
 		return err
diff --git a/cache/repo_cache_test.go b/cache/repo_cache_test.go
index 276da4be..e5f8a037 100644
--- a/cache/repo_cache_test.go
+++ b/cache/repo_cache_test.go
@@ -103,7 +103,7 @@ func TestCache(t *testing.T) {
 	require.NoError(t, err)
 
 	// Possible to delete a bug
-	err = cache.RemoveBug([]string{bug1.Id().Human()})
+	err = cache.RemoveBug(bug1.Id().Human(), "")
 	require.NoError(t, err)
 	require.Equal(t, len(cache.AllBugsIds()), 1)
 }