diff --git a/routes/exchange_test.go b/routes/exchange_test.go index 248c2f8e..5ee8a6d4 100644 --- a/routes/exchange_test.go +++ b/routes/exchange_test.go @@ -8,7 +8,6 @@ import ( "log" "net/http" "net/http/httptest" - "os" "testing" "time" @@ -41,41 +40,6 @@ const ( blockSignerPk = "BC1YLiQ86kwXUy3nfK391xht7N72UmbFY6bGrUsds1A7QKZrs4jJsxo" ) -func CleanUpBadger(db *badger.DB) { - // Close the database. - err := db.Close() - if err != nil { - log.Fatal(err) - } - // Delete the database directory. - err = os.RemoveAll(db.Opts().Dir) - if err != nil { - log.Fatal(err) - } -} - -func GetTestBadgerDb(t *testing.T) (_db *badger.DB, _dir string) { - dir, err := os.MkdirTemp("", "badgerdb") - if err != nil { - log.Fatal(err) - } - - // Open a badgerdb in a temporary directory. - opts := badger.DefaultOptions(dir) - opts.Dir = dir - opts.ValueDir = dir - // No logger when running tests - opts.Logger = nil - db, err := badger.Open(opts) - if err != nil { - log.Fatal(err) - } - t.Cleanup(func() { - CleanUpBadger(db) - }) - return db, dir -} - func NewLowDifficultyBlockchain(t *testing.T) (*lib.Blockchain, *lib.DeSoParams, *badger.DB, string) { // Set the number of txns per view regeneration to one while creating the txns diff --git a/routes/server.go b/routes/server.go index 3b55f0cf..6f21e971 100644 --- a/routes/server.go +++ b/routes/server.go @@ -2971,7 +2971,7 @@ func UpdateIPsForURLs(urlList []string, ipAddressMap map[string]string) (map[str for _, url := range urlList { ipAddresses, err := GetIPsForURL(url) if err != nil { - fmt.Printf("Error getting IP for URL %v: %v\n", url, err) + glog.Infof("Error getting IP for URL %v: %v\n", url, err) continue } for _, ipAddress := range ipAddresses { diff --git a/routes/test_utils.go b/routes/test_utils.go new file mode 100644 index 00000000..faa91b07 --- /dev/null +++ b/routes/test_utils.go @@ -0,0 +1,43 @@ +package routes + +import ( + "github.com/dgraph-io/badger/v3" + "log" + "os" + "testing" +) + +func GetTestBadgerDb(t *testing.T) (_db *badger.DB, _dir string) { + dir, err := os.MkdirTemp("", "badgerdb") + if err != nil { + log.Fatal(err) + } + + // Open a badgerdb in a temporary directory. + opts := badger.DefaultOptions(dir) + opts.Dir = dir + opts.ValueDir = dir + // No logger when running tests + opts.Logger = nil + db, err := badger.Open(opts) + if err != nil { + log.Fatal(err) + } + t.Cleanup(func() { + CleanUpBadger(db) + }) + return db, dir +} + +func CleanUpBadger(db *badger.DB) { + // Close the database. + err := db.Close() + if err != nil { + log.Fatal(err) + } + // Delete the database directory. + err = os.RemoveAll(db.Opts().Dir) + if err != nil { + log.Fatal(err) + } +}