From 028cfd34b70f97a2994235ab14fa32639f9f5dd1 Mon Sep 17 00:00:00 2001 From: Julian Meyer Date: Tue, 6 Mar 2018 22:05:00 -0800 Subject: [PATCH] Update migrations to fix bug after removing migration 0 --- repo/migrations/Migration001.go | 4 ++-- repo/migrations/Migration001_test.go | 4 ++-- repo/migrations/Migration002.go | 4 ++-- repo/migrations/Migration002_test.go | 4 ++-- repo/migrations/Migration003.go | 4 ++-- repo/migrations/Migration003_test.go | 4 ++-- repo/migrations/Migration004.go | 7 ++++--- repo/migrations/Migration004_test.go | 4 ++-- repo/migrations/Migration005.go | 7 ++++--- repo/migrations/Migration005_test.go | 4 ++-- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/repo/migrations/Migration001.go b/repo/migrations/Migration001.go index 68c17cadf4..b7aa6ba47c 100644 --- a/repo/migrations/Migration001.go +++ b/repo/migrations/Migration001.go @@ -88,7 +88,7 @@ func (migration001) Up(repoPath string, dbPassword string, testnet bool) error { if err != nil { return err } - _, err = f1.Write([]byte("2")) + _, err = f1.Write([]byte("1")) if err != nil { return err } @@ -169,7 +169,7 @@ func (migration001) Down(repoPath string, dbPassword string, testnet bool) error if err != nil { return err } - _, err = f1.Write([]byte("1")) + _, err = f1.Write([]byte("0")) if err != nil { return err } diff --git a/repo/migrations/Migration001_test.go b/repo/migrations/Migration001_test.go index a1f4757e58..58077214de 100644 --- a/repo/migrations/Migration001_test.go +++ b/repo/migrations/Migration001_test.go @@ -93,7 +93,7 @@ func TestMigration001(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "2" { + if string(repoVer) != "1" { t.Error("Failed to write new repo version") } @@ -148,7 +148,7 @@ func TestMigration001(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "1" { + if string(repoVer) != "0" { t.Error("Failed to write new repo version") } diff --git a/repo/migrations/Migration002.go b/repo/migrations/Migration002.go index 1734e6ac5d..b602042852 100644 --- a/repo/migrations/Migration002.go +++ b/repo/migrations/Migration002.go @@ -55,7 +55,7 @@ func (migration002) Up(repoPath string, dbPassword string, testnet bool) error { if err != nil { return err } - _, err = f1.Write([]byte("3")) + _, err = f1.Write([]byte("2")) if err != nil { return err } @@ -97,7 +97,7 @@ func (migration002) Down(repoPath string, dbPassword string, testnet bool) error if err != nil { return err } - _, err = f1.Write([]byte("2")) + _, err = f1.Write([]byte("1")) if err != nil { return err } diff --git a/repo/migrations/Migration002_test.go b/repo/migrations/Migration002_test.go index c3548e80d4..4117550d20 100644 --- a/repo/migrations/Migration002_test.go +++ b/repo/migrations/Migration002_test.go @@ -42,7 +42,7 @@ func TestMigration002(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "3" { + if string(repoVer) != "2" { t.Error("Failed to write new repo version") } @@ -65,7 +65,7 @@ func TestMigration002(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "2" { + if string(repoVer) != "1" { t.Error("Failed to write new repo version") } diff --git a/repo/migrations/Migration003.go b/repo/migrations/Migration003.go index 83417a8bc6..35cd11188d 100644 --- a/repo/migrations/Migration003.go +++ b/repo/migrations/Migration003.go @@ -45,7 +45,7 @@ func (migration003) Up(repoPath string, dbPassword string, testnet bool) error { if err != nil { return err } - _, err = f1.Write([]byte("4")) + _, err = f1.Write([]byte("3")) if err != nil { return err } @@ -85,7 +85,7 @@ func (migration003) Down(repoPath string, dbPassword string, testnet bool) error if err != nil { return err } - _, err = f1.Write([]byte("3")) + _, err = f1.Write([]byte("2")) if err != nil { return err } diff --git a/repo/migrations/Migration003_test.go b/repo/migrations/Migration003_test.go index 423dc72c38..0a21615c2d 100644 --- a/repo/migrations/Migration003_test.go +++ b/repo/migrations/Migration003_test.go @@ -36,7 +36,7 @@ func TestMigration003(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "4" { + if string(repoVer) != "3" { t.Error("Failed to write new repo version") } @@ -56,7 +56,7 @@ func TestMigration003(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "3" { + if string(repoVer) != "2" { t.Error("Failed to write new repo version") } diff --git a/repo/migrations/Migration004.go b/repo/migrations/Migration004.go index 2b23f19c3d..b402260e44 100644 --- a/repo/migrations/Migration004.go +++ b/repo/migrations/Migration004.go @@ -4,8 +4,9 @@ import ( "database/sql" "path" - _ "github.com/mutecomm/go-sqlcipher" "os" + + _ "github.com/mutecomm/go-sqlcipher" ) // Migration004 variable is used in one of several repo version migrations @@ -48,7 +49,7 @@ func (migration004) Up(repoPath string, dbPassword string, testnet bool) error { if err != nil { return err } - _, err = f1.Write([]byte("5")) + _, err = f1.Write([]byte("4")) if err != nil { return err } @@ -120,7 +121,7 @@ func (migration004) Down(repoPath string, dbPassword string, testnet bool) error if err != nil { return err } - _, err = f1.Write([]byte("4")) + _, err = f1.Write([]byte("3")) if err != nil { return err } diff --git a/repo/migrations/Migration004_test.go b/repo/migrations/Migration004_test.go index 08e18aca79..61045ed6bd 100644 --- a/repo/migrations/Migration004_test.go +++ b/repo/migrations/Migration004_test.go @@ -38,7 +38,7 @@ func TestMigration004(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "5" { + if string(repoVer) != "4" { t.Error("Failed to write new repo version") } @@ -56,7 +56,7 @@ func TestMigration004(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "4" { + if string(repoVer) != "3" { t.Error("Failed to write new repo version") } os.RemoveAll("./datastore") diff --git a/repo/migrations/Migration005.go b/repo/migrations/Migration005.go index 86c8596d71..a00e53d2ab 100644 --- a/repo/migrations/Migration005.go +++ b/repo/migrations/Migration005.go @@ -3,9 +3,10 @@ package migrations import ( "path" - _ "github.com/mutecomm/go-sqlcipher" "io/ioutil" "os" + + _ "github.com/mutecomm/go-sqlcipher" ) var Migration005 migration005 @@ -24,7 +25,7 @@ func (migration005) Up(repoPath string, dbPassword string, testnet bool) error { return err } - _, err = f1.Write([]byte("6")) + _, err = f1.Write([]byte("5")) if err != nil { return err } @@ -42,7 +43,7 @@ func (migration005) Down(repoPath string, dbPassword string, testnet bool) error return err } - _, err = f1.Write([]byte("5")) + _, err = f1.Write([]byte("4")) if err != nil { return err } diff --git a/repo/migrations/Migration005_test.go b/repo/migrations/Migration005_test.go index e919206178..578db08f09 100644 --- a/repo/migrations/Migration005_test.go +++ b/repo/migrations/Migration005_test.go @@ -24,7 +24,7 @@ func TestMigration005(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "6" { + if string(repoVer) != "5" { t.Error("Failed to write new repo version") } @@ -43,7 +43,7 @@ func TestMigration005(t *testing.T) { if err != nil { t.Error(err) } - if string(repoVer) != "5" { + if string(repoVer) != "4" { t.Error("Failed to write new repo version") } os.RemoveAll("./datastore")