.

go/neo/server/cluster_test.go

@@ -161,8 +161,11 @@ func TestMasterStorage(t *testing.T) {
 	//tc.ExpectNetTx("2c", "2s", "\x00\x00\x00\x01")	// handshake
 	//tc.ExpectNetTx("2s", "2c", "\x00\x00\x00\x01")
 	tc.ExpectPar(
-		&xnet.TraceTx{Src: "2c", Dst: "2s", Pkt: []byte("\x00\x00\x00\x01")},
-		&xnet.TraceTx{Src: "2s", Dst: "2c", Pkt: []byte("\x00\x00\x00\x01")},)
+		//&xnet.TraceTx{Src: "2c", Dst: "2s", Pkt: []byte("\x00\x00\x00\x01")},
+		//&xnet.TraceTx{Src: "2s", Dst: "2c", Pkt: []byte("\x00\x00\x00\x01")},)
+		&xnet.TraceTx{Src: &pipenet.Addr{Net: "pipe", Port: 2, Endpoint: 0}, Dst: &pipenet.Addr{Net: "pipe", Port: 2, Endpoint: 1}, Pkt: []byte("\x00\x00\x00\x01")},
+	)
+		//&xnet.TraceTx{Src: "2s", Dst: "2c", Pkt: []byte("\x00\x00\x00\x01")},)
 
 
 	// XXX temp

go/xcommon/xnet/pipenet/pipenet.go

@@ -52,7 +52,6 @@ import (
 const NetPrefix = "pipe" // pipenet package creates only "pipe*" networks
 
 var (
-	errBadAddress		= errors.New("invalid address")
 	errNetClosed		= errors.New("network connection closed")
 	errAddrAlreadyUsed	= errors.New("address already in use")
 	errConnRefused		= errors.New("connection refused")

go/xcommon/xtesting/xtesting.go

@@ -146,8 +146,8 @@ loop:
 		// matching event not found - bad
 		strv := []string{}
 		for _, e := range eventExpectV {
-			strv = append(strv, fmt.Sprintf("%v", e))
+			strv = append(strv, fmt.Sprintf("%T %v", e, e))
 		}
-		tc.t.Fatalf("expect: have: %v\nwant: [%v]", msg.Event, strings.Join(strv, " | "))
+		tc.t.Fatalf("expect:\nhave: %T %v\nwant: [%v]", msg.Event, msg.Event, strings.Join(strv, " | "))
 	}
 }