Merge branch 'master' into BUX-399/ConfirmContact

bitcoin-sv · Mar 13, 2024 · 64c7fc7 · 64c7fc7
2 parents a223083 + e88eba0
commit 64c7fc7
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 47 deletions.
diff --git a/actions/access_keys/access_keys_test.go b/actions/access_keys/access_keys_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -29,9 +27,6 @@ func (ts *TestSuite) TearDownSuite() {
 func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
-	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler(ts.AppConfig, ts.Services)
 	routes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

diff --git a/actions/admin/admin_test.go b/actions/admin/admin_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	adminRoutes := NewHandler(ts.AppConfig, ts.Services)
 	adminRoutes.RegisterAdminEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

diff --git a/actions/base/base_test.go b/actions/base/base_test.go
@@ -4,8 +4,6 @@ import (
 	"testing"
 
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -29,8 +27,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler()
 	routes.RegisterBaseEndpoints(ts.Router.Group(""))
 }

diff --git a/actions/contacts/contacts_test.go b/actions/contacts/contacts_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler(ts.AppConfig, ts.Services)
 	routes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

diff --git a/actions/destinations/destination_test.go b/actions/destinations/destination_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	basicRoutes, apiRoutes := NewHandler(ts.AppConfig, ts.Services)
 	basicRoutes.RegisterBasicEndpoints(ts.Router.Group("/" + config.APIVersion))
 	apiRoutes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))

diff --git a/actions/transactions/transaction_test.go b/actions/transactions/transaction_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	basicRoutes, apiRoutes, callbackRoutes := NewHandler(ts.AppConfig, ts.Services)
 	basicRoutes.RegisterBasicEndpoints(ts.Router.Group("/" + config.APIVersion))
 	apiRoutes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))

diff --git a/actions/utxos/utxo_test.go b/actions/utxos/utxo_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	apiRoutes := NewHandler(ts.AppConfig, ts.Services)
 	apiRoutes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

diff --git a/actions/xpubs/xpubs_test.go b/actions/xpubs/xpubs_test.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler(ts.AppConfig, ts.Services)
 	routes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

diff --git a/config/config_test.go b/config/config_test.go
@@ -4,17 +4,18 @@ import (
 	"context"
 	"testing"
 
-	"github.com/bitcoin-sv/spv-wallet/logging"
 	"github.com/mrz1836/go-cachestore"
 	"github.com/mrz1836/go-datastore"
+	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 // newTestConfig will make a new test config
 func newTestConfig(t *testing.T) (ac *AppConfig) {
-	defaultLogger := logging.GetDefaultLogger()
-	ac, err := Load(defaultLogger)
+	nop := zerolog.Nop()
+	ac, err := Load(&nop)
+
 	require.NoError(t, err)
 	require.NotNil(t, ac)
 	return

diff --git a/config/load.go b/config/load.go
@@ -45,13 +45,25 @@ func Load(logger *zerolog.Logger) (appConfig *AppConfig, err error) {
 		if err != nil {
 			logger.Error().Msg("Unable to decode App Config to json")
 		} else {
-			fmt.Printf("loaded config: %s", cfg)
+			logger.Debug().Msgf("loaded config: %s", cfg)
 		}
 	}
 
 	return appConfig, nil
 }
 
+// LoadForTest returns test AppConfig
+func LoadForTest() (appConfig *AppConfig) {
+
+	appConfig = getDefaultAppConfig()
+	appConfig.Debug = false
+	appConfig.DebugProfiling = false
+	appConfig.Logging.Level = zerolog.LevelErrorValue
+	appConfig.Logging.Format = "console"
+
+	return appConfig
+}
+
 func setDefaults() error {
 	viper.SetDefault(ConfigFilePathKey, DefaultConfigFilePath)
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -176,7 +176,6 @@ configs:
   frontend-env-config:
     content: |
       {
-          "paymailDomain": "${RUN_PAYMAIL_DOMAIN}",
           "apiUrl": "http${RUN_SECURED_PROTOCOL_SUFFIX}://${RUN_API_DOMAIN}",
           "wsUrl": "ws${RUN_SECURED_PROTOCOL_SUFFIX}://${RUN_API_DOMAIN}/api/websocket"
       }

diff --git a/server/auth/middleware.go b/server/auth/middleware.go
@@ -135,6 +135,7 @@ func SignatureMiddleware(appConfig *config.AppConfig, requireSigning, adminRequi
 	return func(c *gin.Context) {
 		if c.Request.Body == nil {
 			c.AbortWithStatusJSON(http.StatusUnauthorized, "missing body")
+			return
 		}
 		defer func() {
 			_ = c.Request.Body.Close()

diff --git a/server/server_test.go b/server/server_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/bitcoin-sv/spv-wallet/engine/utils"
 	"github.com/bitcoin-sv/spv-wallet/models"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -40,9 +39,6 @@ func (ts *TestSuite) TearDownSuite() {
 func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
-	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	SetupServerRoutes(ts.AppConfig, ts.Services, ts.Router)
 }
 

diff --git a/tests/tests.go b/tests/tests.go
@@ -7,7 +7,9 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/logging"
+	"github.com/bitcoin-sv/spv-wallet/server/auth"
 	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
@@ -22,11 +24,7 @@ type TestSuite struct {
 
 // BaseSetupSuite runs at the start of the suite
 func (ts *TestSuite) BaseSetupSuite() {
-	// Load the configuration
-	defaultLogger := logging.GetDefaultLogger()
-	var err error
-	ts.AppConfig, err = config.Load(defaultLogger)
-	require.NoError(ts.T(), err)
+	ts.AppConfig = config.LoadForTest()
 }
 
 // BaseTearDownSuite runs after the suite finishes
@@ -46,6 +44,16 @@ func (ts *TestSuite) BaseTearDownSuite() {
 func (ts *TestSuite) BaseSetupTest() {
 	// Load the services
 	var err error
+	nop := zerolog.Nop()
+
+	gin.SetMode(gin.ReleaseMode)
+	engine := gin.New()
+	engine.Use(logging.GinMiddleware(&nop), gin.Recovery())
+	engine.Use(auth.CorsMiddleware())
+
+	ts.Router = engine
+	require.NotNil(ts.T(), ts.Router)
+
 	ts.Services, err = ts.AppConfig.LoadTestServices(context.Background())
 	require.NoError(ts.T(), err)
 }