update

number571 · Oct 7, 2024 · d68f5e1 · d68f5e1
1 parent e4f54d5
commit d68f5e1
Show file tree

Hide file tree

Showing 29 changed files with 7,868 additions and 9,853 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Update `cmd/hidden_lake/helpers/traffic`: "messages_capacity" can be = 0
 - Update `pkg/storage/cache`: cache/lru/lru.go -> cache/lru.go
 - Update `internal/api`: Request success if "200 >= code < 300" (old version only code=200)
+- Update `pkg/storage/database`: delete encryption
 
 <!-- ... -->
 

diff --git a/README.md b/README.md
@@ -69,7 +69,6 @@ The `go-peer` library contains a large number of functions necessary to ensure t
 3. The `network` module is a decentralized communication between network nodes. Allows you to delimit networks and give information a random appearance using the network key.
 4. The `network/anonymity` module to ensure anonymity based on the fifth^ stage. Presents the main functions for working with the network on top of the `network` and `network/anonymity/queue` modules.
 5. The `network/anonymity/queue` module represents the generation, storage and issuance of encrypted messages every time the period specified by the application is reached. Uses the `client`, `client/message` and `network/message` modules.
-6. The `storage/database` module is a `key-value` database with the functions of value encryption and key hashing.
 
 > Examples of works in the directories [pkg/client/examples](pkg/client/examples/), [pkg/network/examples](pkg/network/examples/), [pkg/network/anonymity/examples](pkg/network/anonymity/examples/), [pkg/network/anonymity/queue/examples](pkg/network/anonymity/queue/examples/);
 

diff --git a/cmd/hidden_lake/_test/result/coverage.out b/cmd/hidden_lake/_test/result/coverage.out
diff --git a/cmd/hidden_lake/_test/result/coverage.svg b/cmd/hidden_lake/_test/result/coverage.svg
diff --git a/cmd/hidden_lake/adapters/common/cmd/service/main.go b/cmd/hidden_lake/adapters/common/cmd/service/main.go
@@ -26,11 +26,7 @@ var (
 
 func initDB() database.IKVDatabase {
 	var err error
-	db, err = database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath: databasePath,
-		}),
-	)
+	db, err = database.NewKVDatabase(databasePath)
 	if err != nil {
 		panic(err)
 	}

diff --git a/cmd/hidden_lake/adapters/common/internal/consumer/pkg/app/app.go b/cmd/hidden_lake/adapters/common/internal/consumer/pkg/app/app.go
@@ -48,11 +48,7 @@ func (p *sApp) Run(pCtx context.Context) error {
 	}
 	defer func() { _ = p.fState.Disable(nil) }()
 
-	kvDB, err := database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath: settings.CPathDB,
-		}),
-	)
+	kvDB, err := database.NewKVDatabase(settings.CPathDB)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/hidden_lake/applications/messenger/internal/database/database.go b/cmd/hidden_lake/applications/messenger/internal/database/database.go
@@ -13,8 +13,8 @@ type sKeyValueDB struct {
 	fDB    database.IKVDatabase
 }
 
-func NewKeyValueDB(pSettings database.ISettings) (IKVDatabase, error) {
-	db, err := database.NewKVDatabase(pSettings)
+func NewKeyValueDB(pPath string) (IKVDatabase, error) {
+	db, err := database.NewKVDatabase(pPath)
 	if err != nil {
 		return nil, utils.MergeErrors(ErrCreateDB, err)
 	}

diff --git a/cmd/hidden_lake/applications/messenger/internal/database/database_test.go b/cmd/hidden_lake/applications/messenger/internal/database/database_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
-	"github.com/number571/go-peer/pkg/storage/database"
 	testutils "github.com/number571/go-peer/test/utils"
 )
 
@@ -31,9 +30,7 @@ func TestDatabase(t *testing.T) {
 	os.RemoveAll(tcPath)
 	defer os.RemoveAll(tcPath)
 
-	db, err := NewKeyValueDB(database.NewSettings(&database.SSettings{
-		FPath: tcPath,
-	}))
+	db, err := NewKeyValueDB(tcPath)
 	if err != nil {
 		t.Error(err)
 		return

diff --git a/cmd/hidden_lake/applications/messenger/pkg/app/init_database.go b/cmd/hidden_lake/applications/messenger/pkg/app/init_database.go
@@ -6,15 +6,10 @@ import (
 
 	hlm_database "github.com/number571/go-peer/cmd/hidden_lake/applications/messenger/internal/database"
 	hlm_settings "github.com/number571/go-peer/cmd/hidden_lake/applications/messenger/pkg/settings"
-	"github.com/number571/go-peer/pkg/storage/database"
 )
 
 func (p *sApp) initDatabase() error {
-	db, err := hlm_database.NewKeyValueDB(
-		database.NewSettings(&database.SSettings{
-			FPath: filepath.Join(p.fPathTo, hlm_settings.CPathDB),
-		}),
-	)
+	db, err := hlm_database.NewKeyValueDB(filepath.Join(p.fPathTo, hlm_settings.CPathDB))
 	if err != nil {
 		return fmt.Errorf("open KV database: %w", err)
 	}

diff --git a/cmd/hidden_lake/helpers/traffic/internal/database/database_test.go b/cmd/hidden_lake/helpers/traffic/internal/database/database_test.go
@@ -26,17 +26,4 @@ func TestVoidKVDatabase(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	sett := db.GetSettings()
-	if sett.GetPassword() != "" {
-		t.Error("password is not null")
-		return
-	}
-	if sett.GetWorkSize() != 0 {
-		t.Error("work size is not null")
-		return
-	}
-	if sett.GetPath() != "_" {
-		t.Error("path is not null")
-		return
-	}
 }
diff --git a/cmd/hidden_lake/helpers/traffic/internal/database/void_database.go b/cmd/hidden_lake/helpers/traffic/internal/database/void_database.go
@@ -4,14 +4,13 @@ import "github.com/number571/go-peer/pkg/storage/database"
 
 var _ database.IKVDatabase = &sVoidKVDatabase{}
 
-type sVoidKVDatabase struct{ fSettings database.ISettings }
+type sVoidKVDatabase struct{}
 
 func NewVoidKVDatabase() database.IKVDatabase {
-	return &sVoidKVDatabase{fSettings: database.NewSettings(&database.SSettings{FPath: "_"})}
+	return &sVoidKVDatabase{}
 }
 
-func (p *sVoidKVDatabase) Set([]byte, []byte) error        { return nil }
-func (p *sVoidKVDatabase) Get([]byte) ([]byte, error)      { return nil, database.ErrNotFound }
-func (p *sVoidKVDatabase) Del([]byte) error                { return nil }
-func (p *sVoidKVDatabase) Close() error                    { return nil }
-func (p *sVoidKVDatabase) GetSettings() database.ISettings { return p.fSettings }
+func (p *sVoidKVDatabase) Set([]byte, []byte) error   { return nil }
+func (p *sVoidKVDatabase) Get([]byte) ([]byte, error) { return nil, database.ErrNotFound }
+func (p *sVoidKVDatabase) Del([]byte) error           { return nil }
+func (p *sVoidKVDatabase) Close() error               { return nil }
diff --git a/cmd/hidden_lake/helpers/traffic/internal/handler/handler_test.go b/cmd/hidden_lake/helpers/traffic/internal/handler/handler_test.go
@@ -53,11 +53,7 @@ func testNetworkMessageSettings() net_message.IConstructSettings {
 }
 
 func testAllRun(addr string) (*http.Server, context.CancelFunc, storage.IMessageStorage, hlt_client.IClient) {
-	db, err := database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath: fmt.Sprintf(databaseTemplate, addr),
-		}),
-	)
+	db, err := database.NewKVDatabase(fmt.Sprintf(databaseTemplate, addr))
 	if err != nil {
 		panic(err)
 	}

diff --git a/cmd/hidden_lake/helpers/traffic/pkg/app/init_database.go b/cmd/hidden_lake/helpers/traffic/pkg/app/init_database.go
@@ -14,11 +14,7 @@ func (p *sApp) initDatabase() error {
 		p.fDatabase = hlt_database.NewVoidKVDatabase()
 		return nil
 	}
-	db, err := database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath: filepath.Join(p.fPathTo, hlt_settings.CPathDB),
-		}),
-	)
+	db, err := database.NewKVDatabase(filepath.Join(p.fPathTo, hlt_settings.CPathDB))
 	if err != nil {
 		return fmt.Errorf("init database: %w", err)
 	}

diff --git a/cmd/hidden_lake/service/internal/handler/handler_test.go b/cmd/hidden_lake/service/internal/handler/handler_test.go
@@ -184,13 +184,7 @@ func testRunNewNode(dbPath, addr string) (anonymity.INode, context.Context, cont
 }
 
 func testNewNode(dbPath, addr string) anonymity.INode {
-	db, err := database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath:     dbPath,
-			FWorkSize: testutils.TCWorkSize,
-			FPassword: "CIPHER",
-		}),
-	)
+	db, err := database.NewKVDatabase(dbPath)
 	if err != nil {
 		panic(err)
 	}

diff --git a/cmd/hidden_lake/service/pkg/app/init_anon_node.go b/cmd/hidden_lake/service/pkg/app/init_anon_node.go
@@ -41,11 +41,7 @@ func (p *sApp) initAnonNode() error {
 		cfgSettings = cfg.GetSettings()
 	)
 
-	kvDatabase, err := database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath: filepath.Join(p.fPathTo, hls_settings.CPathDB),
-		}),
-	)
+	kvDatabase, err := database.NewKVDatabase(filepath.Join(p.fPathTo, hls_settings.CPathDB))
 	if err != nil {
 		return utils.MergeErrors(ErrOpenKVDatabase, err)
 	}

diff --git a/pkg/network/anonymity/anonymity_test.go b/pkg/network/anonymity/anonymity_test.go
@@ -665,13 +665,7 @@ func (p *stLogging) HasErro() bool {
 */
 
 func testNewNode(timeWait time.Duration, addr string, typeDB, numDB int) (INode, context.CancelFunc) {
-	db, err := database.NewKVDatabase(
-		database.NewSettings(&database.SSettings{
-			FPath:     fmt.Sprintf(tcPathDBTemplate, typeDB, numDB),
-			FWorkSize: testutils.TCWorkSize,
-			FPassword: "CIPHER",
-		}),
-	)
+	db, err := database.NewKVDatabase(fmt.Sprintf(tcPathDBTemplate, typeDB, numDB))
 	if err != nil {
 		panic(err)
 	}

diff --git a/pkg/network/anonymity/examples/echo/construct.go b/pkg/network/anonymity/examples/echo/construct.go
@@ -63,11 +63,7 @@ func newNode(serviceName, address string) anonymity.INode {
 			},
 		),
 		func() database.IKVDatabase {
-			db, err := database.NewKVDatabase(
-				database.NewSettings(&database.SSettings{
-					FPath: "./database_" + serviceName + ".db",
-				}),
-			)
+			db, err := database.NewKVDatabase("./database_" + serviceName + ".db")
 			if err != nil {
 				panic(err)
 			}

diff --git a/pkg/network/anonymity/examples/ping-ping/construct.go b/pkg/network/anonymity/examples/ping-ping/construct.go
@@ -63,11 +63,7 @@ func newNode(serviceName, address string) anonymity.INode {
 			},
 		),
 		func() database.IKVDatabase {
-			db, err := database.NewKVDatabase(
-				database.NewSettings(&database.SSettings{
-					FPath: "./database_" + serviceName + ".db",
-				}),
-			)
+			db, err := database.NewKVDatabase("./database_" + serviceName + ".db")
 			if err != nil {
 				panic(err)
 			}

diff --git a/pkg/network/types.go b/pkg/network/types.go
@@ -26,8 +26,8 @@ type INode interface {
 
 	GetSettings() ISettings
 	GetCacheSetter() cache.ICacheSetter
-	GetConnections() map[string]conn.IConn
 
+	GetConnections() map[string]conn.IConn
 	AddConnection(context.Context, string) error
 	DelConnection(string) error