Skip to content

Commit

Permalink
added better logging to Optimizer tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@CryptoSax
CryptoSax committed Jul 27, 2020
1 parent f60317a commit c26934e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 27 deletions.
15 changes: 8 additions & 7 deletions transports/Optimizer/v3/Optimizer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3"
"github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3"
"github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3"
"github.com/op/go-logging"
"golang.org/x/net/proxy"
"io/ioutil"
"net"
Expand Down Expand Up @@ -81,7 +82,7 @@ func TestShadowDial(t *testing.T) {
}

func TestOptimizerShadowDial(t *testing.T) {
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235")
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{})
transports := []TransportDialer{&shadowTransport}
strategy := NewFirstStrategy(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand All @@ -92,7 +93,7 @@ func TestOptimizerShadowDial(t *testing.T) {
}

func TestOptimizerObfs2Dial(t *testing.T) {
obfs2Transport := obfs2.New("127.0.0.1:1237", proxy.Direct)
obfs2Transport := obfs2.New("127.0.0.1:1237", proxy.Direct, &logging.Logger{})
transports := []TransportDialer{obfs2Transport}
strategy := NewFirstStrategy(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand Down Expand Up @@ -147,7 +148,7 @@ func TestOptimizerTransportFirstDial(t *testing.T) {
IatMode: 0,
Address: "127.0.0.1:1234",
Dialer: dialer}
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235")
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{})
transports := []TransportDialer{obfs4Transport, &shadowTransport}
strategy := NewFirstStrategy(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand All @@ -172,7 +173,7 @@ func TestOptimizerTransportRandomDial(t *testing.T) {
Address: "127.0.0.1:1234",
Dialer: dialer,
}
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235")
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{})
transports := []TransportDialer{obfs4Transport, &shadowTransport}
strategy := NewRandomStrategy(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand All @@ -198,7 +199,7 @@ func TestOptimizerTransportRotateDial(t *testing.T) {
Address: "127.0.0.1:1234",
Dialer: dialer,
}
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235")
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{})
transports := []TransportDialer{obfs4Transport, &shadowTransport}
strategy := NewRotateStrategy(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand All @@ -224,7 +225,7 @@ func TestOptimizerTransportTrackDial(t *testing.T) {
Address: "127.0.0.1:1234",
Dialer: dialer,
}
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235")
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{})
transports := []TransportDialer{obfs4Transport, &shadowTransport}
strategy := NewTrackStrategy(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand All @@ -250,7 +251,7 @@ func TestOptimizerTransportMinimizeDialDurationDial(t *testing.T) {
Address: "127.0.0.1:1234",
Dialer: dialer,
}
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235")
shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{})
transports := []TransportDialer{obfs4Transport, &shadowTransport}
strategy := NewMinimizeDialDuration(transports)
optimizerTransport := NewOptimizerClient(transports, strategy)
Expand Down
9 changes: 5 additions & 4 deletions transports/Optimizer/v3/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ module github.com/OperatorFoundation/shapeshifter-transports/transports/Optimize
go 1.12

require (
github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3 v3.0.4
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.4
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.4
github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.4
github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3 v3.0.6
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.6
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.6
github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.6
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
)
26 changes: 10 additions & 16 deletions transports/Optimizer/v3/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,24 @@ github.com/OperatorFoundation/ed25519 v0.0.0-20200225224545-b22b4bd3ddef h1:1xEt
github.com/OperatorFoundation/ed25519 v0.0.0-20200225224545-b22b4bd3ddef/go.mod h1:gQNGvsyT4Zmps9H/yzCqdc+RQzt8ZxCndRNtGTYnBzQ=
github.com/OperatorFoundation/obfs4 v1.0.0 h1:OcfdNMzv69fKQrLTkTSwpaBkHyBZMLjigA5M3txZpAg=
github.com/OperatorFoundation/obfs4 v1.0.0/go.mod h1:6apgxOLYwyvbpzujpFHWu6Jlc+mjn1aFK7WvNijIVWc=
github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0 h1:zDYt6FDJwDSX4woVFVK2EMt7fkxU5L5qDNLUjQwA+BQ=
github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0/go.mod h1:kB00Ak8Dgn1uZlZHLc/WsUta58Jc+n/ZhCetcPkh42Q=
github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 h1:6aQs+TF3KULMarpzbKu8DhFOF9D2UBCaAN5ZtbK53nQ=
github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0/go.mod h1:gb/QiZH0QDXLSQ9PskyJ2oTflB7tsP4AYc8y+FppvB0=
github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3 v3.0.4 h1:G/QFqjBHDI98SXnEubABJEVSEO4I5Mp7Lt1CliaEBlA=
github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3 v3.0.4/go.mod h1:vmd701MBvvskTdbXxJ+opzqHeGSD3k8kC0PhWDKtLWM=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.4 h1:c73lxT+T92cM42mhgyUtcxyjIB0Fa0hWq6Ti/vZPWu4=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.4/go.mod h1:Jy0DdH5gfALoQvxLv7J06TdydoZ5fFfeN9jVN/hLMdw=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.4 h1:3OoYnC43wy0+M4pMaFFUpDx39zJ13fAtraFHLVlsbzc=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.4/go.mod h1:bAGX3ChJElvQMxEsNdjP+yW3CFcVqdiPWfLg7jipbu8=
github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.4 h1:nN9agys5DKv2WLd8KhhO0BO5q76CqnRmuslPtkoOcJQ=
github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.4/go.mod h1:UBXOdrFoTJKCq9bd5ae+u95S0YPtH+I70IHbVw+qjnQ=
github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3 v3.0.5 h1:UYwk4CrDS2kwC0BALiRHPHmH84T2aUY7sPO7S+njjtk=
github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3 v3.0.5/go.mod h1:gW1GFU+PS/+snW7IK7gcObExPKCzsvIL1z2g9N/5ubM=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.5 h1:MdQoHHz+zAHJ37HCJsu6xCtrrA2HMi2uvELlfLzmdAo=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.5/go.mod h1:i8hkRv+UCu0YbOll8NqoDzDBsRR6XgMa1bykKsTUxTg=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.5 h1:cJjpLLspo1FqwpFW+TOF83zpMZ4kjT4IV68W1WXqBzY=
github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.5/go.mod h1:jdYrSKfsppvvtY/WHSL2mN2FdFNiQ7S/XzQxrty0+2I=
github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.5 h1:VhqKDPPYCKTntpnWYgZgL9VACiXCpZZOItLLZW4d/uY=
github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.5/go.mod h1:EQS0MxXaaSQO2IoAwVyXsgx7RBWL6Yy+gMiEn2YJRbo=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4=
github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/shadowsocks/go-shadowsocks2 v0.0.11 h1:dXloqEhYnZV40jblWTK8kWeC0Eb+dgql4S0tj99e8j0=
github.com/shadowsocks/go-shadowsocks2 v0.0.11/go.mod h1:R+KWaoIwRRhnpw6XV+dZil0XHi64Hc1D7hXUyXTjUzQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/willscott/goturn v0.0.0-20170802220503-19f41278d0c9/go.mod h1:PfwRjodCaQXOsHnh2DeVaXqCFCIrbn5WLj1+A5bQkD4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
Expand All @@ -37,5 +33,3 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 comments on commit c26934e

Please sign in to comment.