Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
94aabce1
Unverified
Commit
94aabce1
authored
Apr 16, 2020
by
Janoš Guljaš
Committed by
GitHub
Apr 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix errors reported by deepsource (#101)
parent
c52fd30e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
10 deletions
+19
-10
cmd_test.go
cmd/bee/cmd/cmd_test.go
+5
-2
hive.go
pkg/hive/hive.go
+4
-2
localstore.go
pkg/localstore/localstore.go
+1
-1
example_store_test.go
pkg/shed/example_store_test.go
+4
-2
store.go
pkg/statestore/test/store.go
+3
-1
chunk.go
pkg/storage/testing/chunk.go
+2
-2
No files found.
cmd/bee/cmd/cmd_test.go
View file @
94aabce1
...
@@ -21,11 +21,14 @@ func TestMain(m *testing.M) {
...
@@ -21,11 +21,14 @@ func TestMain(m *testing.M) {
fmt
.
Fprintln
(
os
.
Stderr
,
err
)
fmt
.
Fprintln
(
os
.
Stderr
,
err
)
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
defer
os
.
RemoveAll
(
dir
)
homeDir
=
dir
homeDir
=
dir
os
.
Exit
(
m
.
Run
())
code
:=
m
.
Run
()
if
err
:=
os
.
RemoveAll
(
dir
);
err
!=
nil
{
fmt
.
Fprintln
(
os
.
Stderr
,
err
)
}
os
.
Exit
(
code
)
}
}
func
newCommand
(
t
*
testing
.
T
,
opts
...
cmd
.
Option
)
(
c
*
cmd
.
Command
)
{
func
newCommand
(
t
*
testing
.
T
,
opts
...
cmd
.
Option
)
(
c
*
cmd
.
Command
)
{
...
...
pkg/hive/hive.go
View file @
94aabce1
...
@@ -119,11 +119,13 @@ func (s *Service) peersHandler(_ context.Context, peer p2p.Peer, stream p2p.Stre
...
@@ -119,11 +119,13 @@ func (s *Service) peersHandler(_ context.Context, peer p2p.Peer, stream p2p.Stre
_
,
r
:=
protobuf
.
NewWriterAndReader
(
stream
)
_
,
r
:=
protobuf
.
NewWriterAndReader
(
stream
)
var
peersReq
pb
.
Peers
var
peersReq
pb
.
Peers
if
err
:=
r
.
ReadMsgWithTimeout
(
messageTimeout
,
&
peersReq
);
err
!=
nil
{
if
err
:=
r
.
ReadMsgWithTimeout
(
messageTimeout
,
&
peersReq
);
err
!=
nil
{
stream
.
Close
()
_
=
stream
.
Close
()
return
fmt
.
Errorf
(
"read requestPeers message: %w"
,
err
)
return
fmt
.
Errorf
(
"read requestPeers message: %w"
,
err
)
}
}
stream
.
Close
()
if
err
:=
stream
.
Close
();
err
!=
nil
{
return
fmt
.
Errorf
(
"close stream: %w"
,
err
)
}
for
_
,
newPeer
:=
range
peersReq
.
Peers
{
for
_
,
newPeer
:=
range
peersReq
.
Peers
{
addr
,
err
:=
ma
.
NewMultiaddr
(
newPeer
.
Underlay
)
addr
,
err
:=
ma
.
NewMultiaddr
(
newPeer
.
Underlay
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/localstore/localstore.go
View file @
94aabce1
...
@@ -308,7 +308,7 @@ func New(path string, baseKey []byte, o *Options, logger logging.Logger) (db *DB
...
@@ -308,7 +308,7 @@ func New(path string, baseKey []byte, o *Options, logger logging.Logger) (db *DB
EncodeKey
:
func
(
fields
shed
.
Item
)
(
key
[]
byte
,
err
error
)
{
EncodeKey
:
func
(
fields
shed
.
Item
)
(
key
[]
byte
,
err
error
)
{
key
=
make
([]
byte
,
40
)
key
=
make
([]
byte
,
40
)
binary
.
BigEndian
.
PutUint64
(
key
[
:
8
],
uint64
(
fields
.
StoreTimestamp
))
binary
.
BigEndian
.
PutUint64
(
key
[
:
8
],
uint64
(
fields
.
StoreTimestamp
))
copy
(
key
[
8
:
],
fields
.
Address
[
:
]
)
copy
(
key
[
8
:
],
fields
.
Address
)
return
key
,
nil
return
key
,
nil
},
},
DecodeKey
:
func
(
key
[]
byte
)
(
e
shed
.
Item
,
err
error
)
{
DecodeKey
:
func
(
key
[]
byte
)
(
e
shed
.
Item
,
err
error
)
{
...
...
pkg/shed/example_store_test.go
View file @
94aabce1
...
@@ -308,12 +308,14 @@ func Example_store() {
...
@@ -308,12 +308,14 @@ func Example_store() {
ch
:=
testing
.
GenerateTestRandomChunk
()
ch
:=
testing
.
GenerateTestRandomChunk
()
err
=
s
.
Put
(
context
.
Background
(),
ch
)
err
=
s
.
Put
(
context
.
Background
(),
ch
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Fatal
(
err
)
fmt
.
Println
(
err
)
return
}
}
got
,
err
:=
s
.
Get
(
context
.
Background
(),
ch
.
Address
())
got
,
err
:=
s
.
Get
(
context
.
Background
(),
ch
.
Address
())
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Fatal
(
err
)
fmt
.
Println
(
err
)
return
}
}
fmt
.
Println
(
bytes
.
Equal
(
got
.
Data
(),
ch
.
Data
()))
fmt
.
Println
(
bytes
.
Equal
(
got
.
Data
(),
ch
.
Data
()))
...
...
pkg/statestore/test/store.go
View file @
94aabce1
...
@@ -61,7 +61,9 @@ func RunPersist(t *testing.T, f func(t *testing.T, dir string) storage.StateStor
...
@@ -61,7 +61,9 @@ func RunPersist(t *testing.T, f func(t *testing.T, dir string) storage.StateStor
testStoreIterator
(
t
,
store
,
"some_prefix"
,
1000
)
testStoreIterator
(
t
,
store
,
"some_prefix"
,
1000
)
// close the store
// close the store
store
.
Close
()
if
err
:=
store
.
Close
();
err
!=
nil
{
t
.
Fatal
(
err
)
}
// bootstrap with the same old dir
// bootstrap with the same old dir
persistedStore
:=
f
(
t
,
dir
)
persistedStore
:=
f
(
t
,
dir
)
...
...
pkg/storage/testing/chunk.go
View file @
94aabce1
...
@@ -37,9 +37,9 @@ func init() {
...
@@ -37,9 +37,9 @@ func init() {
// using this function.
// using this function.
func
GenerateTestRandomChunk
()
swarm
.
Chunk
{
func
GenerateTestRandomChunk
()
swarm
.
Chunk
{
data
:=
make
([]
byte
,
swarm
.
ChunkSize
)
data
:=
make
([]
byte
,
swarm
.
ChunkSize
)
rand
.
Read
(
data
)
_
,
_
=
rand
.
Read
(
data
)
key
:=
make
([]
byte
,
32
)
key
:=
make
([]
byte
,
32
)
rand
.
Read
(
key
)
_
,
_
=
rand
.
Read
(
key
)
return
swarm
.
NewChunk
(
swarm
.
NewAddress
(
key
),
data
)
return
swarm
.
NewChunk
(
swarm
.
NewAddress
(
key
),
data
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment