_

status-im · Jan 31, 2020 · 3787d16 · 3787d16
1 parent 4934cca
commit 3787d16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/services/ext/service.go b/services/ext/service.go
@@ -115,7 +115,7 @@ func (s *Service) GetPeer(rawURL string) (*enode.Node, error) {
 	return enode.ParseV4(rawURL)
 }
 
-func (s *Service) InitProtocol(identity *ecdsa.PrivateKey, db *sql.DB) error { // nolint: gocyclo
+func (s *Service) InitProtocol(identity *ecdsa.PrivateKey, db *sql.DB, rootDataDir string) error { // nolint: gocyclo
 	if !s.config.PFSEnabled {
 		return nil
 	}
@@ -131,7 +131,8 @@ func (s *Service) InitProtocol(identity *ecdsa.PrivateKey, db *sql.DB) error { /
 
 	s.identity = identity
 
-	dataDir := filepath.Clean(s.config.BackupDisabledDataDir)
+	backupDir := filepath.Join(rootDataDir, s.config.BackupDisabledDataDir)
+	dataDir := filepath.Clean(backupDir)
 
 	if err := os.MkdirAll(dataDir, os.ModePerm); err != nil {
 		return err

diff --git a/services/shhext/api_geth_test.go b/services/shhext/api_geth_test.go
@@ -210,7 +210,7 @@ func TestInitProtocol(t *testing.T) {
 	sqlDB, err := sqlite.OpenDB(fmt.Sprintf("%s/db.sql", tmpdir), "password")
 	require.NoError(t, err)
 
-	err = service.InitProtocol(privateKey, sqlDB)
+	err = service.InitProtocol(privateKey, sqlDB, "")
 	require.NoError(t, err)
 }
 
@@ -264,7 +264,7 @@ func (s *ShhExtSuite) createAndAddNode() {
 	s.Require().NoError(err)
 	privateKey, err := crypto.GenerateKey()
 	s.NoError(err)
-	err = service.InitProtocol(privateKey, sqlDB)
+	err = service.InitProtocol(privateKey, sqlDB, "")
 	s.NoError(err)
 	err = stack.Register(func(n *node.ServiceContext) (node.Service, error) {
 		return service, nil

diff --git a/services/wakuext/api_test.go b/services/wakuext/api_test.go
@@ -125,7 +125,7 @@ func TestInitProtocol(t *testing.T) {
 	sqlDB, err := sqlite.OpenDB(fmt.Sprintf("%s/db.sql", tmpdir), "password")
 	require.NoError(t, err)
 
-	err = service.InitProtocol(privateKey, sqlDB)
+	err = service.InitProtocol(privateKey, sqlDB, "")
 	require.NoError(t, err)
 }
 
@@ -179,7 +179,7 @@ func (s *ShhExtSuite) createAndAddNode() {
 	s.Require().NoError(err)
 	privateKey, err := crypto.GenerateKey()
 	s.NoError(err)
-	err = service.InitProtocol(privateKey, sqlDB)
+	err = service.InitProtocol(privateKey, sqlDB, "")
 	s.NoError(err)
 	err = stack.Register(func(n *node.ServiceContext) (node.Service, error) {
 		return service, nil