From 6e3c94f94303c90b2c6e42e7a04dd70389813b80 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 8 Dec 2017 11:22:03 -0800 Subject: [PATCH] switch multipro example to a different UUID package We already have this one imported into GX. Saves the effort of importing a different one. --- examples/multipro/echo.go | 4 ++-- examples/multipro/ping.go | 4 ++-- package.json | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/multipro/echo.go b/examples/multipro/echo.go index 372283b..7f77894 100644 --- a/examples/multipro/echo.go +++ b/examples/multipro/echo.go @@ -8,11 +8,11 @@ import ( inet "github.com/libp2p/go-libp2p-net" - uuid "github.com/google/uuid" assert "github.com/ipfs/go-ipfs/thirdparty/assert" "github.com/libp2p/go-libp2p-host" p2p "github.com/libp2p/go-libp2p/examples/multipro/pb" protobufCodec "github.com/multiformats/go-multicodec/protobuf" + uuid "github.com/satori/go.uuid" ) // pattern: /protocol-name/request-or-response-message/version @@ -125,7 +125,7 @@ func (e *EchoProtocol) Echo(host host.Host) bool { // create message data req := &p2p.EchoRequest{ - MessageData: e.node.NewMessageData(uuid.New().String(), false), + MessageData: e.node.NewMessageData(uuid.Must(uuid.NewV4()).String(), false), Message: fmt.Sprintf("Echo from %s", e.node.ID())} signature, err := e.node.signProtoMessage(req) diff --git a/examples/multipro/ping.go b/examples/multipro/ping.go index f342aa6..bcc63dc 100644 --- a/examples/multipro/ping.go +++ b/examples/multipro/ping.go @@ -6,11 +6,11 @@ import ( "fmt" "log" - uuid "github.com/google/uuid" "github.com/libp2p/go-libp2p-host" inet "github.com/libp2p/go-libp2p-net" p2p "github.com/libp2p/go-libp2p/examples/multipro/pb" protobufCodec "github.com/multiformats/go-multicodec/protobuf" + uuid "github.com/satori/go.uuid" ) // pattern: /protocol-name/request-or-response-message/version @@ -116,7 +116,7 @@ func (p *PingProtocol) Ping(host host.Host) bool { log.Printf("%s: Sending ping to: %s....", p.node.ID(), host.ID()) // create message data - req := &p2p.PingRequest{MessageData: p.node.NewMessageData(uuid.New().String(), false), + req := &p2p.PingRequest{MessageData: p.node.NewMessageData(uuid.Must(uuid.NewV4()).String(), false), Message: fmt.Sprintf("Ping from %s", p.node.ID())} // sign the data diff --git a/package.json b/package.json index 2991587..d2d817b 100644 --- a/package.json +++ b/package.json @@ -287,6 +287,12 @@ "hash": "QmRDePEiL4Yupq5EkcK3L3ko3iMgYaqUdLu7xc1kqs7dnV", "name": "go-multicodec", "version": "0.1.5" + }, + { + "author": "satori", + "hash": "QmcBWojPoNh4qm7zvv4qiepvCnnc7ALS9qcp7TNwwxT1gT", + "name": "go.uuid", + "version": "1.1.0" } ], "gxVersion": "0.4.0", -- GitLab