From bc5b95be8ab5e88080ed4e3fe1e864b7b9e4e7b2 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Mon, 23 Nov 2015 21:29:23 +0000 Subject: [PATCH] Update packages, fix testutil. Goddamit godep. --- cmd/relaysrv/testutil/main.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/relaysrv/testutil/main.go b/cmd/relaysrv/testutil/main.go index e1d2b44c9..2db410d42 100644 --- a/cmd/relaysrv/testutil/main.go +++ b/cmd/relaysrv/testutil/main.go @@ -53,7 +53,10 @@ func main() { if join { log.Println("Creating client") - relay := client.NewProtocolClient(uri, []tls.Certificate{cert}, nil) + relay, err := client.NewClient(uri, []tls.Certificate{cert}, nil, 10*time.Second) + if err != nil { + log.Fatal(err) + } log.Println("Created client") go relay.Serve() @@ -62,7 +65,7 @@ func main() { go func() { log.Println("Starting invitation receiver") - for invite := range relay.Invitations { + for invite := range relay.Invitations() { select { case recv <- invite: log.Println("Received invitation", invite) @@ -87,7 +90,7 @@ func main() { log.Fatal(err) } - invite, err := client.GetInvitationFromRelay(uri, id, []tls.Certificate{cert}) + invite, err := client.GetInvitationFromRelay(uri, id, []tls.Certificate{cert}, 10*time.Second) if err != nil { log.Fatal(err) } @@ -101,7 +104,7 @@ func main() { connectToStdio(stdin, conn) log.Println("Finished", conn.RemoteAddr(), conn.LocalAddr()) } else if test { - if client.TestRelay(uri, []tls.Certificate{cert}) { + if client.TestRelay(uri, []tls.Certificate{cert}, time.Second, 2*time.Second, 4) { log.Println("OK") } else { log.Println("FAIL")