diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28dfa3f46..b3e0f005e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
### CHANGES
+- `pkg/types`: delete ICloser
- `pkg/logger`: delete GetSettings
- `pkg/network/anonymity/logger`: change interfaces
diff --git a/pkg/network/conn/types.go b/pkg/network/conn/types.go
index 34f216958..437364998 100644
--- a/pkg/network/conn/types.go
+++ b/pkg/network/conn/types.go
@@ -2,16 +2,15 @@ package conn
import (
"context"
+ "io"
"net"
"time"
- "github.com/number571/go-peer/pkg/types"
-
net_message "github.com/number571/go-peer/pkg/network/message"
)
type IConn interface {
- types.ICloser
+ io.Closer
GetSettings() ISettings
GetSocket() net.Conn
diff --git a/pkg/network/types.go b/pkg/network/types.go
index 4dc8fc671..576648a6f 100644
--- a/pkg/network/types.go
+++ b/pkg/network/types.go
@@ -2,11 +2,11 @@ package network
import (
"context"
+ "io"
"time"
"github.com/number571/go-peer/pkg/network/conn"
"github.com/number571/go-peer/pkg/storage/cache"
- "github.com/number571/go-peer/pkg/types"
net_message "github.com/number571/go-peer/pkg/network/message"
)
@@ -19,7 +19,7 @@ type IHandlerF func(
) error
type INode interface {
- types.ICloser
+ io.Closer
Listen(context.Context) error
HandleFunc(uint32, IHandlerF) INode
diff --git a/pkg/storage/database/types.go b/pkg/storage/database/types.go
index 0dcb1c235..f5413b858 100644
--- a/pkg/storage/database/types.go
+++ b/pkg/storage/database/types.go
@@ -1,11 +1,9 @@
package database
-import (
- "github.com/number571/go-peer/pkg/types"
-)
+import "io"
type IKVDatabase interface {
- types.ICloser
+ io.Closer
Set([]byte, []byte) error
Get([]byte) ([]byte, error)
diff --git a/pkg/types/types.go b/pkg/types/types.go
index 06f17c606..96ed9f0dc 100644
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -2,11 +2,8 @@ package types
import (
"context"
- "io"
)
-type ICloser io.Closer
-
type IRunner interface {
Run(context.Context) error
}
diff --git a/test/result/badge_codelines.svg b/test/result/badge_codelines.svg
index d071b6427..9ea42f14b 100644
--- a/test/result/badge_codelines.svg
+++ b/test/result/badge_codelines.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/test/result/badge_coverage.svg b/test/result/badge_coverage.svg
index 2eb8e6b26..9fd7bd14b 100644
--- a/test/result/badge_coverage.svg
+++ b/test/result/badge_coverage.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/test/result/coverage.svg b/test/result/coverage.svg
index d4bc484ff..89020f38a 100644
--- a/test/result/coverage.svg
+++ b/test/result/coverage.svg
@@ -7,7 +7,7 @@
>
-
+
-
+
-
+
-
+