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
164063e9
Commit
164063e9
authored
Jan 29, 2020
by
Petar Radovic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handshake mock refactor
parent
72217321
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
64 deletions
+73
-64
handshake_test.go
pkg/p2p/libp2p/internal/handshake/handshake_test.go
+20
-63
mock.go
pkg/p2p/libp2p/internal/handshake/mock/mock.go
+51
-0
mock.go
pkg/pingpong/mock/mock.go
+2
-1
No files found.
pkg/p2p/libp2p/internal/handshake/handshake_test.go
View file @
164063e9
...
...
@@ -7,59 +7,16 @@ import (
"bytes"
"errors"
"fmt"
"github.com/ethersphere/bee/pkg/swarm"
"io/ioutil"
"testing"
"github.com/ethersphere/bee/pkg/logging"
"github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/mock"
"github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/pb"
"github.com/ethersphere/bee/pkg/p2p/protobuf"
"github.com/ethersphere/bee/pkg/swarm"
)
type
StreamMock
struct
{
readBuffer
*
bytes
.
Buffer
writeBuffer
*
bytes
.
Buffer
writeCounter
int
readCounter
int
readError
error
writeError
error
readErrCheckmark
int
writeErrCheckmark
int
}
func
(
s
*
StreamMock
)
setReadErr
(
err
error
,
checkmark
int
)
{
s
.
readError
=
err
s
.
readErrCheckmark
=
checkmark
}
func
(
s
*
StreamMock
)
setWriteErr
(
err
error
,
checkmark
int
)
{
s
.
writeError
=
err
s
.
writeErrCheckmark
=
checkmark
}
func
(
s
*
StreamMock
)
Read
(
p
[]
byte
)
(
n
int
,
err
error
)
{
if
s
.
readError
!=
nil
&&
s
.
readErrCheckmark
<=
s
.
readCounter
{
return
0
,
s
.
readError
}
s
.
readCounter
++
return
s
.
readBuffer
.
Read
(
p
)
}
func
(
s
*
StreamMock
)
Write
(
p
[]
byte
)
(
n
int
,
err
error
)
{
if
s
.
writeError
!=
nil
&&
s
.
writeErrCheckmark
<=
s
.
writeCounter
{
return
0
,
s
.
writeError
}
s
.
writeCounter
++
return
s
.
writeBuffer
.
Write
(
p
)
}
func
(
s
*
StreamMock
)
Close
()
error
{
return
nil
}
func
TestHandshake
(
t
*
testing
.
T
)
{
node1Addr
:=
swarm
.
MustParseHexAddress
(
"ca1e9f3938cc1425c6061b96ad9eb93e134dfe8734ad490164ef20af9d1cf59c"
)
...
...
@@ -81,8 +38,8 @@ func TestHandshake(t *testing.T) {
var
buffer1
bytes
.
Buffer
var
buffer2
bytes
.
Buffer
stream1
:=
&
StreamMock
{
readBuffer
:
&
buffer1
,
writeBuffer
:
&
buffer2
}
stream2
:=
&
StreamMock
{
readBuffer
:
&
buffer2
,
writeBuffer
:
&
buffer1
}
stream1
:=
mock
.
NewStream
(
&
buffer1
,
&
buffer2
)
stream2
:=
mock
.
NewStream
(
&
buffer2
,
&
buffer1
)
w
,
r
:=
protobuf
.
NewWriterAndReader
(
stream2
)
if
err
:=
w
.
WriteMsg
(
&
pb
.
ShakeHandAck
{
...
...
@@ -111,8 +68,8 @@ func TestHandshake(t *testing.T) {
t
.
Run
(
"ERROR - shakehand write error "
,
func
(
t
*
testing
.
T
)
{
testErr
:=
errors
.
New
(
"test error"
)
expectedErr
:=
fmt
.
Errorf
(
"write message: %w"
,
testErr
)
stream
:=
&
StreamMock
{}
stream
.
s
etWriteErr
(
testErr
,
0
)
stream
:=
&
mock
.
StreamMock
{}
stream
.
S
etWriteErr
(
testErr
,
0
)
res
,
err
:=
handshakeService
.
Handshake
(
stream
)
if
err
==
nil
||
err
.
Error
()
!=
expectedErr
.
Error
()
{
t
.
Fatal
(
"expected:"
,
expectedErr
,
"got:"
,
err
)
...
...
@@ -126,8 +83,8 @@ func TestHandshake(t *testing.T) {
t
.
Run
(
"ERROR - shakehand read error "
,
func
(
t
*
testing
.
T
)
{
testErr
:=
errors
.
New
(
"test error"
)
expectedErr
:=
fmt
.
Errorf
(
"read message: %w"
,
testErr
)
stream
:=
&
StreamMock
{
writeBuffer
:
&
bytes
.
Buffer
{}}
stream
.
s
etReadErr
(
testErr
,
0
)
stream
:=
mock
.
NewStream
(
nil
,
&
bytes
.
Buffer
{})
stream
.
S
etReadErr
(
testErr
,
0
)
res
,
err
:=
handshakeService
.
Handshake
(
stream
)
if
err
==
nil
||
err
.
Error
()
!=
expectedErr
.
Error
()
{
t
.
Fatal
(
"expected:"
,
expectedErr
,
"got:"
,
err
)
...
...
@@ -149,9 +106,9 @@ func TestHandshake(t *testing.T) {
var
buffer1
bytes
.
Buffer
var
buffer2
bytes
.
Buffer
stream1
:=
&
StreamMock
{
readBuffer
:
&
buffer1
,
writeBuffer
:
&
buffer2
}
stream1
.
s
etWriteErr
(
testErr
,
1
)
stream2
:=
&
StreamMock
{
readBuffer
:
&
buffer2
,
writeBuffer
:
&
buffer1
}
stream1
:=
mock
.
NewStream
(
&
buffer1
,
&
buffer2
)
stream1
.
S
etWriteErr
(
testErr
,
1
)
stream2
:=
mock
.
NewStream
(
&
buffer2
,
&
buffer1
)
w
,
_
:=
protobuf
.
NewWriterAndReader
(
stream2
)
if
err
:=
w
.
WriteMsg
(
&
pb
.
ShakeHandAck
{
...
...
@@ -197,8 +154,8 @@ func TestHandle(t *testing.T) {
var
buffer1
bytes
.
Buffer
var
buffer2
bytes
.
Buffer
stream1
:=
&
StreamMock
{
readBuffer
:
&
buffer1
,
writeBuffer
:
&
buffer2
}
stream2
:=
&
StreamMock
{
readBuffer
:
&
buffer2
,
writeBuffer
:
&
buffer1
}
stream1
:=
mock
.
NewStream
(
&
buffer1
,
&
buffer2
)
stream2
:=
mock
.
NewStream
(
&
buffer2
,
&
buffer1
)
w
,
_
:=
protobuf
.
NewWriterAndReader
(
stream2
)
if
err
:=
w
.
WriteMsg
(
&
pb
.
ShakeHand
{
...
...
@@ -236,8 +193,8 @@ func TestHandle(t *testing.T) {
t
.
Run
(
"ERROR - read error "
,
func
(
t
*
testing
.
T
)
{
testErr
:=
errors
.
New
(
"test error"
)
expectedErr
:=
fmt
.
Errorf
(
"read message: %w"
,
testErr
)
stream
:=
&
StreamMock
{}
stream
.
s
etReadErr
(
testErr
,
0
)
stream
:=
&
mock
.
StreamMock
{}
stream
.
S
etReadErr
(
testErr
,
0
)
res
,
err
:=
handshakeService
.
Handle
(
stream
)
if
err
==
nil
||
err
.
Error
()
!=
expectedErr
.
Error
()
{
t
.
Fatal
(
"expected:"
,
expectedErr
,
"got:"
,
err
)
...
...
@@ -252,8 +209,8 @@ func TestHandle(t *testing.T) {
testErr
:=
errors
.
New
(
"test error"
)
expectedErr
:=
fmt
.
Errorf
(
"write message: %w"
,
testErr
)
var
buffer
bytes
.
Buffer
stream
:=
&
StreamMock
{
readBuffer
:
&
buffer
,
writeBuffer
:
&
buffer
}
stream
.
s
etWriteErr
(
testErr
,
1
)
stream
:=
mock
.
NewStream
(
&
buffer
,
&
buffer
)
stream
.
S
etWriteErr
(
testErr
,
1
)
w
,
_
:=
protobuf
.
NewWriterAndReader
(
stream
)
if
err
:=
w
.
WriteMsg
(
&
pb
.
ShakeHand
{
Address
:
node1Addr
.
Bytes
(),
...
...
@@ -284,9 +241,9 @@ func TestHandle(t *testing.T) {
var
buffer1
bytes
.
Buffer
var
buffer2
bytes
.
Buffer
stream1
:=
&
StreamMock
{
readBuffer
:
&
buffer1
,
writeBuffer
:
&
buffer2
}
stream2
:=
&
StreamMock
{
readBuffer
:
&
buffer2
,
writeBuffer
:
&
buffer1
}
stream1
.
s
etReadErr
(
testErr
,
1
)
stream1
:=
mock
.
NewStream
(
&
buffer1
,
&
buffer2
)
stream2
:=
mock
.
NewStream
(
&
buffer2
,
&
buffer1
)
stream1
.
S
etReadErr
(
testErr
,
1
)
w
,
_
:=
protobuf
.
NewWriterAndReader
(
stream2
)
if
err
:=
w
.
WriteMsg
(
&
pb
.
ShakeHand
{
Address
:
node2Info
.
Address
.
Bytes
(),
...
...
pkg/p2p/libp2p/internal/handshake/mock/mock.go
0 → 100644
View file @
164063e9
package
mock
import
"bytes"
type
StreamMock
struct
{
readBuffer
*
bytes
.
Buffer
writeBuffer
*
bytes
.
Buffer
writeCounter
int
readCounter
int
readError
error
writeError
error
readErrCheckmark
int
writeErrCheckmark
int
}
func
NewStream
(
readBuffer
,
writeBuffer
*
bytes
.
Buffer
)
*
StreamMock
{
return
&
StreamMock
{
readBuffer
:
readBuffer
,
writeBuffer
:
writeBuffer
}
}
func
(
s
*
StreamMock
)
SetReadErr
(
err
error
,
checkmark
int
)
{
s
.
readError
=
err
s
.
readErrCheckmark
=
checkmark
}
func
(
s
*
StreamMock
)
SetWriteErr
(
err
error
,
checkmark
int
)
{
s
.
writeError
=
err
s
.
writeErrCheckmark
=
checkmark
}
func
(
s
*
StreamMock
)
Read
(
p
[]
byte
)
(
n
int
,
err
error
)
{
if
s
.
readError
!=
nil
&&
s
.
readErrCheckmark
<=
s
.
readCounter
{
return
0
,
s
.
readError
}
s
.
readCounter
++
return
s
.
readBuffer
.
Read
(
p
)
}
func
(
s
*
StreamMock
)
Write
(
p
[]
byte
)
(
n
int
,
err
error
)
{
if
s
.
writeError
!=
nil
&&
s
.
writeErrCheckmark
<=
s
.
writeCounter
{
return
0
,
s
.
writeError
}
s
.
writeCounter
++
return
s
.
writeBuffer
.
Write
(
p
)
}
func
(
s
*
StreamMock
)
Close
()
error
{
return
nil
}
pkg/pingpong/mock/mock.go
View file @
164063e9
...
...
@@ -6,8 +6,9 @@ package mock
import
(
"context"
"github.com/ethersphere/bee/pkg/swarm"
"time"
"github.com/ethersphere/bee/pkg/swarm"
)
type
Service
struct
{
...
...
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