Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#6 automate tests #13

Merged
merged 20 commits into from
May 24, 2024
Merged

#6 automate tests #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
67d6007
#6 Allows self-dial in call
XioZ May 9, 2024
a34ca0c
#6 Don't carry source address in packet
XioZ May 9, 2024
5161f56
#6 Don't carry source address in packet
XioZ May 9, 2024
3a7ce7c
#6 Allows self-dial for stream using loopback
XioZ May 10, 2024
067e69c
#6 Allows self-dial for stream using loopback
XioZ May 10, 2024
9375996
#6 Carries source address in packets
XioZ May 11, 2024
04d97e0
#6 Passes integration_test.go. Shows benchmarks
XioZ May 11, 2024
6475d7d
#6 Passes integration_test.go. Shows benchmarks
XioZ May 11, 2024
40bc657
#6 Fixing tests
XioZ May 11, 2024
3f15af9
#6 Benchmarks
XioZ May 13, 2024
89986e9
#6 Carries only public multiaddr in packets
XioZ May 16, 2024
b2c75b8
#6 Uses gob coders
XioZ May 17, 2024
7a0eff4
#6 Uses gob coders
XioZ May 17, 2024
12a70d8
#6 Don't send to self after session ends. Don't receive message after…
XioZ May 17, 2024
8dc6198
#6 Refactored createSession()
XioZ May 17, 2024
8417bc9
#6 Don't send to self if session ended
XioZ May 17, 2024
f29f8d3
#6 Refactored
XioZ May 21, 2024
1fc1146
#6 Refactored
XioZ May 21, 2024
c7b5001
#6 Listen to end session continuously in a separate goroutine
XioZ May 21, 2024
da38d99
#6 End session when context closed or stream reset
XioZ May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions mino/minows/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type minows struct {

// NewMinows creates a new Minows instance that starts listening.
// listen: listening address in multiaddress format,
// e.g. /ip4/0.0.0.0/tcp/0/ or /ip4/127.0.0.1/tcp/80/ws
// e.g. /ip4/127.0.0.1/tcp/80/ws
// public: public dial-able address in multiaddress format,
// e.g. /dns4/p2p-1.c4dt.dela.org/tcp/443/wss
// `public` can be nil and will be determined
Expand Down Expand Up @@ -78,11 +78,12 @@ func (m *minows) WithSegment(segment string) mino.Mino {
}

return &minows{
logger: m.logger,
myAddr: m.myAddr,
segments: append(m.segments, segment),
host: m.host,
rpcs: make(map[string]any),
factory: m.factory,
factory: addressFactory{},
}
}

Expand All @@ -107,7 +108,10 @@ func (m *minows) CreateRPC(name string, h mino.Handler, f serde.Factory) (mino.R

r := &rpc{
logger: m.logger.With().Str("rpc", uri).Logger(),
myAddr: m.myAddr,
uri: uri,
host: m.host,
handler: h,
mino: m,
factory: f,
context: json.NewContext(),
Expand Down
114 changes: 56 additions & 58 deletions mino/minows/mod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,73 +6,69 @@ import (
"github.com/libp2p/go-libp2p/core/peer"
ma "github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require"
"go.dedis.ch/dela/mino"
"testing"
)

func TestNewMinows(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000/ws"
const random = "/ip4/127.0.0.1/tcp/0/ws"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
const publicWSS = "/ip4/127.0.0.1/tcp/443/wss"
type args struct {
listen ma.Multiaddr
public ma.Multiaddr
}
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
const wss = "/ip4/127.0.0.1/tcp/443/wss"
var tests = map[string]struct {
args args
listen string
public string
}{
"ws": {
args: args{
listen: mustCreateMultiaddress(t, listen),
public: mustCreateMultiaddress(t, publicWS),
},
},
"wss": {
args: args{
listen: mustCreateMultiaddress(t, listen),
public: mustCreateMultiaddress(t, publicWSS),
},
},
"no public": {
args: args{
listen: mustCreateMultiaddress(t, listen),
public: nil,
},
},
"random": {
args: args{
listen: mustCreateMultiaddress(t, random),
public: nil,
},
},
"ws": {listen: listen, public: ws},
"wss": {listen: listen, public: wss},
}
key := mustCreateKey(t)
for name, tt := range tests {
t.Run(name, func(t *testing.T) {
key := mustCreateKey(t)
listen := mustCreateMultiaddress(t, tt.listen)
public := mustCreateMultiaddress(t, tt.public)

m, err := NewMinows(listen, public, key)
require.NoError(t, err)
require.NotNil(t, m)
require.IsType(t, &minows{}, m)
require.NoError(t, m.(*minows).stop())
})
}
}

m, err := NewMinows(tt.args.listen, tt.args.public, key)
func TestNewMinows_OptionalPublic(t *testing.T) {
listen := mustCreateMultiaddress(t, "/ip4/0.0.0.0/tcp/6000/ws")
random := mustCreateMultiaddress(t, "/ip4/127.0.0.1/tcp/0/ws")
tests := map[string]ma.Multiaddr{
"no public": listen,
"random listen": random,
}
key := mustCreateKey(t)

for name, tt := range tests {
t.Run(name, func(t *testing.T) {
m, err := NewMinows(tt, nil, key)
require.NoError(t, err)
require.NotNil(t, m)
require.IsType(t, &minows{}, m)
require.NoError(t, m.(*minows).stop())
})

}
}

func Test_minows_GetAddressFactory(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
const publicWSS = "/ip4/127.0.0.1/tcp/443/wss"
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
const wss = "/ip4/127.0.0.1/tcp/443/wss"
type m struct {
listen string
public string
}
tests := map[string]struct {
m m
}{
"ws": {m{listen, publicWS}},
"wss": {m{listen, publicWSS}},
"ws": {m{listen, ws}},
"wss": {m{listen, wss}},
}
for name, tt := range tests {
t.Run(name, func(t *testing.T) {
Expand All @@ -89,7 +85,7 @@ func Test_minows_GetAddressFactory(t *testing.T) {
func Test_minows_GetAddress(t *testing.T) {
const listen = "/ip4/127.0.0.1/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/80/ws"
const publicWSS = "/ip4/127.0.0.1/tcp/443/wss"
const wss = "/ip4/127.0.0.1/tcp/443/wss"
key := mustCreateKey(t)
id := mustDerivePeerID(t, key).String()
type m struct {
Expand All @@ -106,7 +102,7 @@ func Test_minows_GetAddress(t *testing.T) {
want want
}{
"ws": {m{listen, publicWS, key}, want{publicWS, id}},
"wss": {m{listen, publicWSS, key}, want{publicWSS, id}},
"wss": {m{listen, wss, key}, want{wss, id}},
"no public": {m{listen, "", key}, want{listen, id}},
}
for name, tt := range tests {
Expand Down Expand Up @@ -139,8 +135,8 @@ func Test_minows_GetAddress_Random(t *testing.T) {

func Test_minows_WithSegment_Empty(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, publicWS)
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, ws)
defer stop()

got := m.WithSegment("")
Expand All @@ -149,8 +145,8 @@ func Test_minows_WithSegment_Empty(t *testing.T) {

func Test_minows_WithSegment(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, publicWS)
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, ws)
defer stop()

got := m.WithSegment("test")
Expand All @@ -163,8 +159,8 @@ func Test_minows_WithSegment(t *testing.T) {

func Test_minows_CreateRPC_InvalidName(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, publicWS)
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, ws)
defer stop()

_, err := m.CreateRPC("invalid name", nil, nil)
Expand All @@ -173,8 +169,8 @@ func Test_minows_CreateRPC_InvalidName(t *testing.T) {

func Test_minows_CreateRPC_AlreadyExists(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, publicWS)
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, ws)
defer stop()

_, err := m.CreateRPC("test", nil, nil)
Expand All @@ -185,8 +181,8 @@ func Test_minows_CreateRPC_AlreadyExists(t *testing.T) {

func Test_minows_CreateRPC_InvalidSegment(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, publicWS)
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, ws)
defer stop()
m = m.WithSegment("invalid segment").(*minows)

Expand All @@ -196,8 +192,8 @@ func Test_minows_CreateRPC_InvalidSegment(t *testing.T) {

func Test_minows_CreateRPC(t *testing.T) {
const listen = "/ip4/0.0.0.0/tcp/6000"
const publicWS = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, publicWS)
const ws = "/ip4/127.0.0.1/tcp/6000/ws"
m, stop := mustCreateMinows(t, listen, ws)
defer stop()

r1, err := m.CreateRPC("test", nil, nil)
Expand All @@ -216,14 +212,16 @@ func Test_minows_CreateRPC(t *testing.T) {
require.NotNil(t, r4)
}

func mustCreateMinows(t *testing.T, listen string, public string) (mino.Mino,
func mustCreateMinows(t *testing.T, listen string, public string) (*minows,
func()) {
key := mustCreateKey(t)
m, err := NewMinows(mustCreateMultiaddress(t, listen),
mustCreateMultiaddress(t, public), key)
lis := mustCreateMultiaddress(t, listen)
pub := mustCreateMultiaddress(t, public)
m, err := NewMinows(lis, pub, key)
require.NoError(t, err)
stop := func() { require.NoError(t, m.(*minows).stop()) }
return m, stop
ws := m.(*minows)
stop := func() { require.NoError(t, ws.stop()) }
return ws, stop
}

func mustCreateKey(t *testing.T) crypto.PrivKey {
Expand Down
Loading
Loading