From 3787d160d0680d67ecf227f36206563e4dca44aa Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Fri, 31 Jan 2020 16:22:51 +0200 Subject: [PATCH] _ --- services/ext/service.go | 5 +++-- services/shhext/api_geth_test.go | 4 ++-- services/wakuext/api_test.go | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/services/ext/service.go b/services/ext/service.go index 547bc5cc2df..de74ef97f9a 100644 --- 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 index 02b9cf45ac5..9a70f3166b9 100644 --- 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 index 939529661cf..10aae329956 100644 --- 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