From 350eecdb86a3351ec7f3b9bb8a847c14fa2e615a Mon Sep 17 00:00:00 2001 From: superzordon Date: Wed, 20 Dec 2023 13:38:06 -0500 Subject: [PATCH 1/9] Empty commit to trigger build From 5f158a7e5438413c93ef5e183831df0fbb1aca37 Mon Sep 17 00:00:00 2001 From: superzordon Date: Thu, 8 Aug 2024 18:56:22 -0400 Subject: [PATCH 2/9] Updates for testing suite --- routes/exchange_test.go | 36 ---------------------------------- routes/test_utils.go | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 36 deletions(-) create mode 100644 routes/test_utils.go 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/test_utils.go b/routes/test_utils.go new file mode 100644 index 00000000..a36c9fa0 --- /dev/null +++ b/routes/test_utils.go @@ -0,0 +1,43 @@ +package routes + +import ( + "github.com/dgraph-io/badger/v3" + "log" + "os" + "testing" +) + +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 +} From 0f2857a45b36c9c2b373ef37801c8b1415bbd8bd Mon Sep 17 00:00:00 2001 From: superzordon Date: Thu, 8 Aug 2024 18:56:45 -0400 Subject: [PATCH 3/9] Empty commit to trigger build From 93628f83d7c85875717340a63217f94e6545ad29 Mon Sep 17 00:00:00 2001 From: superzordon Date: Thu, 8 Aug 2024 18:58:54 -0400 Subject: [PATCH 4/9] Remove test utils change --- routes/exchange_test.go | 36 ++++++++++++++++++++++++++++++++++ routes/test_utils.go | 43 ----------------------------------------- 2 files changed, 36 insertions(+), 43 deletions(-) delete mode 100644 routes/test_utils.go diff --git a/routes/exchange_test.go b/routes/exchange_test.go index 5ee8a6d4..248c2f8e 100644 --- a/routes/exchange_test.go +++ b/routes/exchange_test.go @@ -8,6 +8,7 @@ import ( "log" "net/http" "net/http/httptest" + "os" "testing" "time" @@ -40,6 +41,41 @@ 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/test_utils.go b/routes/test_utils.go deleted file mode 100644 index a36c9fa0..00000000 --- a/routes/test_utils.go +++ /dev/null @@ -1,43 +0,0 @@ -package routes - -import ( - "github.com/dgraph-io/badger/v3" - "log" - "os" - "testing" -) - -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 -} From dfd3eb57a9318a3f3cb30c0050f1b46836b2420d Mon Sep 17 00:00:00 2001 From: superzordon Date: Thu, 8 Aug 2024 19:28:20 -0400 Subject: [PATCH 5/9] Empty commit to trigger build From dba8d61f7e21bee1b0a2e883e2a35d16188e2467 Mon Sep 17 00:00:00 2001 From: superzordon Date: Fri, 9 Aug 2024 15:45:39 -0400 Subject: [PATCH 6/9] Empty commit to trigger build From 2d6da6c76ca4af3ccfdcf617aa168bbc99ff91bd Mon Sep 17 00:00:00 2001 From: superzordon Date: Fri, 9 Aug 2024 16:10:51 -0400 Subject: [PATCH 7/9] Empty commit to trigger build From f04753dee270cd332d80d823e8ba1d3556e96fab Mon Sep 17 00:00:00 2001 From: superzordon Date: Fri, 16 Aug 2024 14:04:04 -0400 Subject: [PATCH 8/9] Updates to backend --- routes/exchange_test.go | 36 ---------------------------------- routes/server.go | 2 +- routes/test_utils.go | 43 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 routes/test_utils.go 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) + } +} From 3a5d8d34360b052868c23985c70a81e1674e41b9 Mon Sep 17 00:00:00 2001 From: superzordon Date: Fri, 16 Aug 2024 14:04:37 -0400 Subject: [PATCH 9/9] Empty commit to trigger build