From 3d61300c873dfc5d0185b4cd5b170727d2990c5a Mon Sep 17 00:00:00 2001 From: Adam Hanna Date: Tue, 8 Oct 2019 18:05:19 +0000 Subject: [PATCH] finishes name change --- Makefile | 4 +- README.md | 29 ++++---- cmd/analysis/main.go | 4 +- cmd/client/main.go | 14 ++-- cmd/host/main.go | 8 +-- cmd/orchestrate/main.go | 12 ++-- cmd/subnet/main.go | 8 +-- go.mod | 2 +- pkg/analysis/analysis.go | 4 +- pkg/analysis/sorter/sorter.go | 2 +- pkg/analysis/types/types.go | 2 +- pkg/analysis/utils.go | 6 +- pkg/client/client.go | 12 ++-- pkg/client/utils.go | 4 +- pkg/grpc/host/host.go | 4 +- pkg/grpc/host/utils.go | 4 +- pkg/host/config/config.go | 2 +- pkg/host/config/types.go | 2 +- pkg/host/config/utils.go | 2 +- pkg/host/host.go | 6 +- pkg/host/pubsub.go | 4 +- pkg/host/types.go | 6 +- pkg/host/utils.go | 2 +- pkg/orchestrate/config/config.go | 2 +- pkg/orchestrate/config/utils.go | 4 +- pkg/pb/publisher/publisher.pb.go | 66 +++++++++---------- pkg/pb/publisher/publisher.proto | 4 +- pkg/subnet/config/config.go | 2 +- pkg/subnet/config/utils.go | 2 +- pkg/subnet/peertopology/full/full.go | 4 +- pkg/subnet/peertopology/linear/linear.go | 4 +- pkg/subnet/peertopology/peertopology.go | 10 +-- pkg/subnet/peertopology/types.go | 4 +- .../peertopology/whiteblocks/whiteblocks.go | 4 +- pkg/subnet/subnet.go | 6 +- pkg/subnet/types.go | 6 +- pkg/subnet/utils.go | 8 +-- 37 files changed, 136 insertions(+), 133 deletions(-) diff --git a/Makefile b/Makefile index 717503e..84c1041 100644 --- a/Makefile +++ b/Makefile @@ -126,11 +126,11 @@ kill/gopls: .PHONY: docker/host docker/host: - @docker build -t gossip-host -f ./docker/dockerfiles/host/Dockerfile . + @docker build -t go-libp2p-pubsub-benchmark-tools -f ./docker/dockerfiles/host/Dockerfile . .PHONY: docker/client docker/client: - @docker build -t gossip-client -f ./docker/dockerfiles/client/Dockerfile . + @docker build -t go-libp2p-pubsub-benchmark-tools -f ./docker/dockerfiles/client/Dockerfile . .PHONY: help help: Makefile diff --git a/README.md b/README.md index 5c90544..0fac58f 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -> libp2p/go-libp2p-pubsub gossip host +> libp2p/go-libp2p-pubsub benchmark tools -# gossip-host -[![Build Status](https://travis-ci.org/agencyenterprise/gossip-host.svg?branch=develop)](https://travis-ci.org/agencyenterprise/gossip-host) [![Coverage Status](https://coveralls.io/repos/github/agencyenterprise/gossip-host/badge.svg?branch=develop)](https://coveralls.io/github/agencyenterprise/gossip-host?branch=develop) [![Go Report Card](https://goreportcard.com/badge/github.com/agencyenterprise/gossip-host)](https://goreportcard.com/report/github.com/agencyenterprise/gossip-host) [![GoDoc](https://godoc.org/github.com/agencyenterprise/gossip-host?status.svg)](https://godoc.org/github.com/agencyenterprise/gossip-host) +# go-libp2p-pubsub-benchmark-tools +[![Build Status](https://travis-ci.org/agencyenterprise/go-libp2p-pubsub-benchmark-tools.svg?branch=develop)](https://travis-ci.org/agencyenterprise/go-libp2p-pubsub-benchmark-tools) [![Coverage Status](https://coveralls.io/repos/github/agencyenterprise/go-libp2p-pubsub-benchmark-tools/badge.svg?branch=develop)](https://coveralls.io/github/agencyenterprise/go-libp2p-pubsub-benchmark-tools?branch=develop) [![Go Report Card](https://goreportcard.com/badge/github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools)](https://goreportcard.com/report/github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools) [![GoDoc](https://godoc.org/github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools?status.svg)](https://godoc.org/github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools) -This module provides tools for benchmarking the [libp2p gossip pubsub protocol](https://github.com/libp2p/go-libp2p-pubsub); however, it can be easily extended to other pubsub protocols or even beyond pubsub. +This module provides tools for benchmarking the [go-libp2p pubsub protocols](https://github.com/libp2p/go-libp2p-pubsub); however, it can be easily extended to other pubsub protocols or even beyond pubsub. ## Architecture -Hosts are connected to each other via the protocols defined in the config file. Each host also runs an rpc host and can receive messages from clients. Via rpc, clients can request hosts connect and disconnect with peers, gossip a message, shutdown, and more. +Hosts are connected to each other via the protocols defined in the config file. Each host also runs an rpc host and can receive messages from clients. Via rpc, clients can request hosts connect and disconnect with peers, publish a message, shutdown, and more. ## Usage @@ -16,14 +16,14 @@ Hosts are connected to each other via the protocols defined in the config file. The simplest way to use the tool is via `cmd/subnet/main.go`: 1. Spin up a subnet of hosts: `$ go run ./cmd/subnet/main.go` -2. In another terminal, pass a message into the subnet and watch the hosts start gossiping: `$ go run ./cmd/client/main.go gossip` +2. In another terminal, pass a message into the subnet and watch the hosts start publishing: `$ go run ./cmd/client/main.go publish` If you'd like to manually spin up hosts, do the following: 1. `$ go run ./cmd/host/main.go` 2. In another terminal, spin up a second host and connect it to the first: `$ go run ./cmd/host/main.go -l /ip4/127.0.0.2/tcp/3002,/ip4/127.0.0.2/tcp/3003/ws -r :8081 -p `. * Note, the `-l` flag are the listen addresses. Notice how we've incremented standard local host from `127.0.0.1` to `127.0.0.2`. We could have also simply changed the port address. * Further note that `-r` is the rpc listen address and needs to be different for this host than the default `:8080`. -3. In a third terminal, pass a message into the subnet and watch the hosts start gossiping: `$ go run ./cmd/client/main.go gossip` +3. In a third terminal, pass a message into the subnet and watch the hosts start publishing: `$ go run ./cmd/client/main.go publish` ## Commands @@ -61,7 +61,7 @@ Usage: Flags: -h, --help help for analyze - --log string Log file location. Defaults to standard out. + -o, --out string Output json location. Defaults to standard out. ``` An example output is: @@ -87,7 +87,7 @@ Usage: Available Commands: close-all Close all peer connections close-peers Close connections to peers - gossip Gossip a message in the pubsub + publish Publish a message in the pubsub help Help about any command id Get peer ids list-peers List connected peers @@ -138,6 +138,7 @@ The host has many configuration options which can be set between a combination o "peers": [], "muxers": [["yamux", "/yamux/1.0.0"], ["mplex", "/mplex/6.7.0"]], "security": "secio", + "pubsubAlgorithm": "gossip", "omitRelay": false, "omitConnectionManager": false, "omitNATPortMap": false, @@ -196,6 +197,7 @@ The orchestration can be configured via a json file. The default configuration l "transports": ["tcp", "ws"], "muxers": [["yamux", "/yamux/1.0.0"], ["mplex", "/mplex/6.7.0"]], "security": "secio", + "pubsubAlgorithm": "gossip", "omitRelay": false, "omitConnectionManager": false, "omitNATPortMap": false, @@ -218,7 +220,7 @@ The available commands and flags are shown below. ```bash $ go run ./cmd/subnet/main.go --help -Start a subnet of interconnected gossipsub hosts +Start a subnet of interconnected libp2p pubsub hosts Usage: start [flags] @@ -247,6 +249,7 @@ The subnet can be configured via a json file. The default configuration location "transports": ["tcp", "ws"], "muxers": [["yamux", "/yamux/1.0.0"], ["mplex", "/mplex/6.7.0"]], "security": "secio", + "pubsubAlgorithm": "gossip", "omitRelay": false, "omitConnectionManager": false, "omitNATPortMap": false, @@ -290,8 +293,8 @@ syntax = "proto3"; package pb; option java_multiple_files = true; -option java_package = "io.grpc.gossipsub.benchmark"; -option java_outer_classname = "GossipsubBenchmark"; +option java_package = "io.grpc.pubsub.benchmark"; +option java_outer_classname = "PubsubBenchmark"; import "google/protobuf/empty.proto"; @@ -364,7 +367,7 @@ service Publisher { [**MIT**](LICENSE). -[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fagencyenterprise%2Fgossip-host.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fagencyenterprise%2Fgossip-host?ref=badge_large) +[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fagencyenterprise%2Fgo-libp2p-pubsub-benchmark-tools.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fagencyenterprise%2Fgo-libp2p-pubsub-benchmark-tools?ref=badge_large) ``` MIT License diff --git a/cmd/analysis/main.go b/cmd/analysis/main.go index 25abe76..3207758 100644 --- a/cmd/analysis/main.go +++ b/cmd/analysis/main.go @@ -4,8 +4,8 @@ import ( "encoding/json" "os" - "github.com/agencyenterprise/gossip-host/pkg/analysis" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/analysis" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/client/main.go b/cmd/client/main.go index 4c94d66..b2e2e5d 100644 --- a/cmd/client/main.go +++ b/cmd/client/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/agencyenterprise/gossip-host/pkg/client" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/client" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -20,16 +20,16 @@ func setup() (*cobra.Command, error) { rootCmd := &cobra.Command{Use: "client"} publishCMD := &cobra.Command{ - Use: "gossip", - Short: "Gossip a message in the pubsub", - Long: "Request that the passed hosts gossip the passed message", + Use: "publish", + Short: "Publish a message in the pubsub", + Long: "Request that the passed hosts publish the passed message", Run: func(cmd *cobra.Command, args []string) { if err := logger.Set(logger.ContextHook{}, loggerLoc, false); err != nil { logrus.Fatalf("err initiating logger:\n%v", err) } - logger.Infof("sending message to peers for gossip") - if err := client.Gossip(nil, msgLoc, peers, size, timeout); err != nil { + logger.Infof("sending message to peers for publish") + if err := client.Publish(nil, msgLoc, peers, size, timeout); err != nil { logger.Fatalf("err sending messages\n%v", err) } }, diff --git a/cmd/host/main.go b/cmd/host/main.go index 0fdc507..bc02e8e 100644 --- a/cmd/host/main.go +++ b/cmd/host/main.go @@ -6,9 +6,9 @@ import ( "os/signal" "syscall" - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/host/config" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -22,7 +22,7 @@ func setup() *cobra.Command { rootCmd := &cobra.Command{ Use: "start", Short: "Start node", - Long: `Starts the gossip pub/sub node`, + Long: `Starts the go-libp2p pub/sub host`, RunE: func(cmd *cobra.Command, args []string) error { if err := logger.Set(logger.ContextHook{}, loggerLoc, false); err != nil { logrus.Errorf("err initiating logger:\n%v", err) diff --git a/cmd/orchestrate/main.go b/cmd/orchestrate/main.go index bfe2324..7097010 100644 --- a/cmd/orchestrate/main.go +++ b/cmd/orchestrate/main.go @@ -9,10 +9,10 @@ import ( "syscall" "time" - "github.com/agencyenterprise/gossip-host/pkg/client" - "github.com/agencyenterprise/gossip-host/pkg/logger" - "github.com/agencyenterprise/gossip-host/pkg/orchestrate/config" - "github.com/agencyenterprise/gossip-host/pkg/subnet" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/client" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/orchestrate/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet" "github.com/google/uuid" "github.com/sirupsen/logrus" @@ -143,8 +143,8 @@ func setup() *cobra.Command { peerIdx := randBetween(0, len(peers)-1) peer := peers[peerIdx] - logger.Infof("sending message to %s for gossip", peer) - if err := client.Gossip([]byte(id.String()), c.Orchestra.MessageLocation, peer, c.Orchestra.MessageByteSize, c.Orchestra.ClientTimeoutSeconds); err != nil { + logger.Infof("sending message to %s for publish", peer) + if err := client.Publish([]byte(id.String()), c.Orchestra.MessageLocation, peer, c.Orchestra.MessageByteSize, c.Orchestra.ClientTimeoutSeconds); err != nil { logger.Fatalf("err sending messages\n%v", err) e <- err } diff --git a/cmd/subnet/main.go b/cmd/subnet/main.go index 6b06790..fac923c 100644 --- a/cmd/subnet/main.go +++ b/cmd/subnet/main.go @@ -7,9 +7,9 @@ import ( "os/signal" "syscall" - "github.com/agencyenterprise/gossip-host/pkg/logger" - "github.com/agencyenterprise/gossip-host/pkg/subnet" - "github.com/agencyenterprise/gossip-host/pkg/subnet/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/config" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -23,7 +23,7 @@ func setup() *cobra.Command { rootCmd := &cobra.Command{ Use: "start", Short: "Start subnet", - Long: `Start a subnet of interconnected gossipsub hosts`, + Long: `Start a subnet of interconnected libp2p pubsub hosts`, RunE: func(cmd *cobra.Command, args []string) error { if err := logger.Set(logger.ContextHook{}, loggerLoc, false); err != nil { logrus.Errorf("err initiating logger:\n%v", err) diff --git a/go.mod b/go.mod index f3c557b..f312982 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/agencyenterprise/gossip-host +module github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools go 1.13 diff --git a/pkg/analysis/analysis.go b/pkg/analysis/analysis.go index 5606bb6..5cb7550 100644 --- a/pkg/analysis/analysis.go +++ b/pkg/analysis/analysis.go @@ -1,8 +1,8 @@ package analysis import ( - "github.com/agencyenterprise/gossip-host/pkg/analysis/types" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/analysis/types" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) // Analyze parses a log file and returns performance metrics diff --git a/pkg/analysis/sorter/sorter.go b/pkg/analysis/sorter/sorter.go index 4c81193..a543e13 100644 --- a/pkg/analysis/sorter/sorter.go +++ b/pkg/analysis/sorter/sorter.go @@ -3,7 +3,7 @@ package sorter import ( "sort" - "github.com/agencyenterprise/gossip-host/pkg/analysis/types" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/analysis/types" ) // By is the type of a "less" function that defines the ordering of its Planet arguments. diff --git a/pkg/analysis/types/types.go b/pkg/analysis/types/types.go index cf94970..53fc579 100644 --- a/pkg/analysis/types/types.go +++ b/pkg/analysis/types/types.go @@ -1,6 +1,6 @@ package types -import "github.com/agencyenterprise/gossip-host/pkg/cerr" +import "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/cerr" const ( // ErrImproperlyFormattedLogLine is returned when the log line is not in the expected format diff --git a/pkg/analysis/utils.go b/pkg/analysis/utils.go index bd300e0..1c9f75b 100644 --- a/pkg/analysis/utils.go +++ b/pkg/analysis/utils.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/agencyenterprise/gossip-host/pkg/analysis/sorter" - "github.com/agencyenterprise/gossip-host/pkg/analysis/types" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/analysis/sorter" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/analysis/types" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) func loadLogFile(logLoc string) (*bufio.Scanner, func() error, error) { diff --git a/pkg/client/client.go b/pkg/client/client.go index fffa79c..c0ec6dc 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -5,15 +5,15 @@ import ( "errors" "time" - "github.com/agencyenterprise/gossip-host/pkg/logger" - pb "github.com/agencyenterprise/gossip-host/pkg/pb/publisher" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + pb "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/pb/publisher" "github.com/golang/protobuf/ptypes/empty" grpc "google.golang.org/grpc" ) -// Gossip requests the passed peers to gossip the passed message -func Gossip(msgID []byte, msgLoc, peers string, size uint, timeout int) error { +// Publish requests the passed peers to publish the passed message +func Publish(msgID []byte, msgLoc, peers string, size uint, timeout int) error { msg, err := parseMessageFile(msgLoc) if err != nil || msg == nil { logger.Errorf("err parsing message file:\n%v", err) @@ -53,7 +53,7 @@ func Gossip(msgID []byte, msgLoc, peers string, size uint, timeout int) error { r, err := c.PublishMessage(ctx, msg) if err != nil { - logger.Errorf("could not gossip message to %s:\n %v", peer, err) + logger.Errorf("could not publish message to %s:\n %v", peer, err) failed = true conn.Close() cancel() @@ -70,7 +70,7 @@ func Gossip(msgID []byte, msgLoc, peers string, size uint, timeout int) error { } if failed { - return errors.New("gossip failed") + return errors.New("publish failed") } return nil diff --git a/pkg/client/utils.go b/pkg/client/utils.go index 380d8b1..f4ceb8d 100644 --- a/pkg/client/utils.go +++ b/pkg/client/utils.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "strings" - "github.com/agencyenterprise/gossip-host/pkg/logger" - pb "github.com/agencyenterprise/gossip-host/pkg/pb/publisher" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + pb "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/pb/publisher" ) func parseMessageFile(loc string) (*pb.Message, error) { diff --git a/pkg/grpc/host/host.go b/pkg/grpc/host/host.go index 1365f6e..8616cbb 100644 --- a/pkg/grpc/host/host.go +++ b/pkg/grpc/host/host.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/agencyenterprise/gossip-host/pkg/logger" - pb "github.com/agencyenterprise/gossip-host/pkg/pb/publisher" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + pb "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/pb/publisher" "github.com/golang/protobuf/ptypes/empty" ipfsaddr "github.com/ipfs/go-ipfs-addr" diff --git a/pkg/grpc/host/utils.go b/pkg/grpc/host/utils.go index 6c3f04c..089cb3e 100644 --- a/pkg/grpc/host/utils.go +++ b/pkg/grpc/host/utils.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "time" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" - pb "github.com/agencyenterprise/gossip-host/pkg/pb/publisher" + pb "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/pb/publisher" "github.com/davecgh/go-spew/spew" peer "github.com/libp2p/go-libp2p-peer" pubsub "github.com/libp2p/go-libp2p-pubsub" diff --git a/pkg/host/config/config.go b/pkg/host/config/config.go index 2f9c2ed..880d6e6 100644 --- a/pkg/host/config/config.go +++ b/pkg/host/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) // Load reads the passed config file location and parses it into a config struct. diff --git a/pkg/host/config/types.go b/pkg/host/config/types.go index 55ab535..96742f0 100644 --- a/pkg/host/config/types.go +++ b/pkg/host/config/types.go @@ -1,7 +1,7 @@ package config import ( - "github.com/agencyenterprise/gossip-host/pkg/cerr" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/cerr" lcrypto "github.com/libp2p/go-libp2p-core/crypto" ) diff --git a/pkg/host/config/utils.go b/pkg/host/config/utils.go index 597a2f1..47953d2 100644 --- a/pkg/host/config/utils.go +++ b/pkg/host/config/utils.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" "github.com/gobuffalo/packr/v2" lcrypto "github.com/libp2p/go-libp2p-core/crypto" diff --git a/pkg/host/host.go b/pkg/host/host.go index 32fa04b..92530e0 100644 --- a/pkg/host/host.go +++ b/pkg/host/host.go @@ -8,9 +8,9 @@ import ( "strings" "time" - rpcHost "github.com/agencyenterprise/gossip-host/pkg/grpc/host" - "github.com/agencyenterprise/gossip-host/pkg/host/config" - "github.com/agencyenterprise/gossip-host/pkg/logger" + rpcHost "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/grpc/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ipfsaddr "github.com/ipfs/go-ipfs-addr" "github.com/libp2p/go-libp2p" diff --git a/pkg/host/pubsub.go b/pkg/host/pubsub.go index f2a513f..b6f5f7d 100644 --- a/pkg/host/pubsub.go +++ b/pkg/host/pubsub.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "time" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" - pb "github.com/agencyenterprise/gossip-host/pkg/pb/publisher" + pb "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/pb/publisher" peer "github.com/libp2p/go-libp2p-peer" pubsub "github.com/libp2p/go-libp2p-pubsub" ) diff --git a/pkg/host/types.go b/pkg/host/types.go index bf384ab..67541c5 100644 --- a/pkg/host/types.go +++ b/pkg/host/types.go @@ -3,8 +3,8 @@ package host import ( "context" - "github.com/agencyenterprise/gossip-host/pkg/cerr" - "github.com/agencyenterprise/gossip-host/pkg/host/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/cerr" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host/config" lhost "github.com/libp2p/go-libp2p-core/host" lrouter "github.com/libp2p/go-libp2p-core/routing" @@ -30,7 +30,7 @@ const ( pubsubTopic = "/libp2p/test/1.0.0" ) -// Host is the gossipsub host +// Host is the go-libp2p host // note: lhost.Host and lrouter.Routing are interfaces type Host struct { host lhost.Host diff --git a/pkg/host/utils.go b/pkg/host/utils.go index fc24433..b7b7031 100644 --- a/pkg/host/utils.go +++ b/pkg/host/utils.go @@ -3,7 +3,7 @@ package host import ( "strings" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" libp2p "github.com/libp2p/go-libp2p" mplex "github.com/libp2p/go-libp2p-mplex" diff --git a/pkg/orchestrate/config/config.go b/pkg/orchestrate/config/config.go index 3b0f9ce..9766d9f 100644 --- a/pkg/orchestrate/config/config.go +++ b/pkg/orchestrate/config/config.go @@ -1,6 +1,6 @@ package config -import "github.com/agencyenterprise/gossip-host/pkg/logger" +import "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" // Load reads the passed config file location and parses it into a config struct. func Load(confLoc string) (Config, error) { diff --git a/pkg/orchestrate/config/utils.go b/pkg/orchestrate/config/utils.go index eef2ca5..3e5a3ac 100644 --- a/pkg/orchestrate/config/utils.go +++ b/pkg/orchestrate/config/utils.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/agencyenterprise/gossip-host/pkg/logger" - sconf "github.com/agencyenterprise/gossip-host/pkg/subnet/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + sconf "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/config" "github.com/gobuffalo/packr/v2" "github.com/spf13/viper" diff --git a/pkg/pb/publisher/publisher.pb.go b/pkg/pb/publisher/publisher.pb.go index 4e1afa5..62ee42d 100644 --- a/pkg/pb/publisher/publisher.pb.go +++ b/pkg/pb/publisher/publisher.pb.go @@ -463,39 +463,39 @@ func init() { func init() { proto.RegisterFile("publisher.proto", fileDescriptor_41489454d08668ce) } var fileDescriptor_41489454d08668ce = []byte{ - // 512 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x61, 0x6f, 0xd3, 0x30, - 0x14, 0x4c, 0xba, 0x8d, 0x35, 0x6f, 0x5b, 0x07, 0x56, 0xc5, 0xb2, 0x74, 0x88, 0xe0, 0x4f, 0x45, - 0x48, 0x99, 0xd8, 0x40, 0xf0, 0x05, 0xa4, 0x75, 0x1d, 0x23, 0x12, 0x88, 0x2a, 0x88, 0x1f, 0xd0, - 0x24, 0x8f, 0x34, 0x22, 0x8d, 0x4d, 0x9c, 0x08, 0xed, 0x77, 0xf0, 0x87, 0x91, 0x9d, 0xb8, 0xb4, - 0x51, 0xc3, 0xc4, 0xb7, 0xdc, 0xab, 0xef, 0x7c, 0x7e, 0x77, 0x85, 0x63, 0x5e, 0x85, 0x59, 0x2a, - 0x16, 0x58, 0x78, 0xbc, 0x60, 0x25, 0x23, 0x3d, 0x1e, 0x3a, 0xa3, 0x84, 0xb1, 0x24, 0xc3, 0x73, - 0x35, 0x09, 0xab, 0xef, 0xe7, 0xb8, 0xe4, 0xe5, 0x5d, 0x7d, 0x80, 0xfa, 0xb0, 0xff, 0x19, 0x85, - 0x98, 0x27, 0x48, 0x06, 0xd0, 0x4b, 0x63, 0xdb, 0x74, 0xcd, 0xb1, 0x15, 0xf4, 0xd2, 0x98, 0x38, - 0xd0, 0x17, 0xf8, 0xb3, 0xc2, 0x3c, 0x42, 0xbb, 0xe7, 0x9a, 0xe3, 0xbd, 0x60, 0x85, 0x09, 0x81, - 0xdd, 0x78, 0x5e, 0xce, 0xed, 0x1d, 0xd7, 0x1c, 0x1f, 0x06, 0xea, 0x9b, 0xbe, 0x87, 0xc3, 0x59, - 0x7d, 0x7d, 0x80, 0x3c, 0xbb, 0x23, 0x43, 0xd8, 0x5b, 0x8a, 0xc4, 0xd7, 0x92, 0x35, 0x20, 0x36, - 0xec, 0x8b, 0x2a, 0x8a, 0x50, 0x08, 0x25, 0xda, 0x0f, 0x34, 0xa4, 0x6f, 0xe1, 0xec, 0x3a, 0x63, - 0x02, 0xaf, 0xb2, 0x6c, 0x86, 0x58, 0x5c, 0xb3, 0x3c, 0xc7, 0xa8, 0x4c, 0x59, 0x2e, 0x6a, 0xbd, - 0x35, 0xa6, 0xb9, 0xc9, 0x7c, 0x0e, 0x47, 0x5f, 0x17, 0x55, 0x19, 0xb3, 0x5f, 0xf9, 0x7d, 0x47, - 0x9f, 0x81, 0x25, 0xc5, 0xc5, 0xa7, 0x54, 0x94, 0xd2, 0x21, 0x97, 0xc0, 0x36, 0xdd, 0x1d, 0xe9, - 0x50, 0x01, 0xfa, 0x1a, 0x4e, 0x95, 0x8f, 0xff, 0x34, 0x71, 0x0b, 0x27, 0x5f, 0x38, 0xe6, 0x9b, - 0xac, 0x7b, 0x48, 0x72, 0x8f, 0xf2, 0x52, 0xb5, 0x0a, 0x2b, 0x50, 0xdf, 0x34, 0x86, 0x91, 0x16, - 0x12, 0xad, 0xfb, 0x53, 0x14, 0xe4, 0x06, 0x8e, 0x5b, 0xce, 0x94, 0xfd, 0x83, 0x8b, 0x91, 0xc7, - 0x43, 0xaf, 0xc3, 0x42, 0xd0, 0xe6, 0xd0, 0x53, 0xd8, 0xf7, 0xa7, 0xb5, 0xbd, 0x01, 0xf4, 0xfc, - 0xa9, 0x0e, 0xde, 0x9f, 0xd2, 0x57, 0x30, 0x94, 0xeb, 0xc1, 0xfc, 0x2a, 0x8e, 0x0b, 0x14, 0x02, - 0x9b, 0xb7, 0x9f, 0x81, 0xb5, 0x9a, 0x34, 0x2b, 0xfb, 0x3b, 0xb8, 0xf8, 0xbd, 0x0b, 0xd6, 0x4c, - 0xd7, 0x8f, 0xbc, 0x84, 0x41, 0x03, 0x74, 0xbd, 0x0e, 0xa4, 0xbd, 0x06, 0x38, 0x0f, 0x25, 0x58, - 0x6f, 0x0b, 0x35, 0xc8, 0x37, 0x38, 0xe9, 0xc8, 0x9f, 0x3c, 0xf6, 0xea, 0x0e, 0x7b, 0xba, 0xc3, - 0xde, 0x8d, 0xec, 0xb0, 0xe3, 0x4a, 0x99, 0x7f, 0x95, 0x86, 0x1a, 0xe4, 0x03, 0x0c, 0xb7, 0xc5, - 0x49, 0x8e, 0x94, 0x05, 0xdd, 0x05, 0xe7, 0xc9, 0x4a, 0xaa, 0x43, 0xe7, 0x23, 0x0c, 0xb7, 0xc5, - 0xd2, 0xd6, 0x79, 0xba, 0x9e, 0xc2, 0x96, 0xfc, 0xa8, 0x41, 0xde, 0x01, 0x91, 0x47, 0x9b, 0xdf, - 0x30, 0x56, 0x27, 0x3b, 0xdf, 0xb8, 0xa9, 0x4f, 0x0d, 0xf2, 0x06, 0xfa, 0xba, 0xed, 0x9d, 0xa4, - 0x47, 0x92, 0xb4, 0xf1, 0x9f, 0xa0, 0x06, 0x79, 0x21, 0x73, 0xee, 0xa4, 0xa8, 0x7c, 0x9a, 0x4a, - 0x50, 0x43, 0xd6, 0xac, 0x55, 0x82, 0x4e, 0xa6, 0x2d, 0x99, 0xdb, 0x1a, 0x43, 0x8d, 0xc9, 0x25, - 0x8c, 0x52, 0xe6, 0x25, 0x05, 0x8f, 0xbc, 0x84, 0x09, 0x91, 0x72, 0x51, 0x85, 0x5e, 0x88, 0x79, - 0xb4, 0x58, 0xce, 0x8b, 0x1f, 0x13, 0x72, 0xab, 0x87, 0x13, 0x3d, 0x9b, 0x99, 0xe1, 0x03, 0x75, - 0xc1, 0xe5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x4e, 0x2e, 0xd5, 0xcf, 0x04, 0x00, 0x00, + // 509 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xf1, 0x6f, 0x93, 0x40, + 0x18, 0x85, 0x6e, 0xb3, 0xe5, 0xdb, 0xd6, 0xea, 0xa5, 0x71, 0x8c, 0xce, 0x88, 0xf7, 0x53, 0x8d, + 0x91, 0xc5, 0xa9, 0xd1, 0x5f, 0x34, 0x59, 0xd7, 0xa9, 0x24, 0x1a, 0x09, 0xc6, 0x3f, 0xa0, 0xc0, + 0x27, 0x25, 0x52, 0x38, 0x39, 0x88, 0xd9, 0xdf, 0xe1, 0x3f, 0x6c, 0xee, 0xe0, 0x6a, 0x4b, 0x8a, + 0xcb, 0x7e, 0xe3, 0x7d, 0xbd, 0xf7, 0xee, 0xdd, 0xf7, 0x5e, 0x61, 0xc4, 0xaa, 0x20, 0x4d, 0xf8, + 0x12, 0x0b, 0x87, 0x15, 0x79, 0x99, 0x93, 0x1e, 0x0b, 0xac, 0x49, 0x9c, 0xe7, 0x71, 0x8a, 0xe7, + 0x72, 0x12, 0x54, 0x3f, 0xce, 0x71, 0xc5, 0xca, 0x9b, 0xfa, 0x00, 0x75, 0xa1, 0xff, 0x05, 0x39, + 0x5f, 0xc4, 0x48, 0x86, 0xd0, 0x4b, 0x22, 0x53, 0xb7, 0xf5, 0xa9, 0xe1, 0xf7, 0x92, 0x88, 0x58, + 0x30, 0xe0, 0xf8, 0xab, 0xc2, 0x2c, 0x44, 0xb3, 0x67, 0xeb, 0xd3, 0x03, 0x7f, 0x8d, 0x09, 0x81, + 0xfd, 0x68, 0x51, 0x2e, 0xcc, 0x3d, 0x5b, 0x9f, 0x1e, 0xf9, 0xf2, 0x9b, 0xbe, 0x87, 0x23, 0xaf, + 0xbe, 0xde, 0x47, 0x96, 0xde, 0x90, 0x31, 0x1c, 0xac, 0x78, 0xec, 0x2a, 0xc9, 0x1a, 0x10, 0x13, + 0xfa, 0xbc, 0x0a, 0x43, 0xe4, 0x5c, 0x8a, 0x0e, 0x7c, 0x05, 0xe9, 0x5b, 0x38, 0xbb, 0x4a, 0x73, + 0x8e, 0x97, 0x69, 0xea, 0x21, 0x16, 0x57, 0x79, 0x96, 0x61, 0x58, 0x26, 0x79, 0xc6, 0x6b, 0xbd, + 0x0d, 0xa6, 0xbe, 0xcd, 0x7c, 0x0a, 0xc7, 0xdf, 0x96, 0x55, 0x19, 0xe5, 0xbf, 0xb3, 0xdb, 0x8e, + 0x3e, 0x01, 0x43, 0x88, 0xf3, 0xcf, 0x09, 0x2f, 0x85, 0x43, 0x26, 0x80, 0xa9, 0xdb, 0x7b, 0xc2, + 0xa1, 0x04, 0xf4, 0x35, 0x9c, 0x4a, 0x1f, 0x77, 0x34, 0xf1, 0x11, 0x4e, 0xbe, 0x32, 0xcc, 0xb6, + 0x59, 0xb7, 0x90, 0xc4, 0x1e, 0xc5, 0xa5, 0x72, 0x15, 0x86, 0x2f, 0xbf, 0x69, 0x04, 0x13, 0x25, + 0xc4, 0x5b, 0xf7, 0x27, 0xc8, 0xc9, 0x35, 0x8c, 0x5a, 0xce, 0xa4, 0xfd, 0xc3, 0x8b, 0x89, 0xc3, + 0x02, 0xa7, 0xc3, 0x82, 0xdf, 0xe6, 0xd0, 0x53, 0xe8, 0xbb, 0xf3, 0xda, 0xde, 0x10, 0x7a, 0xee, + 0x5c, 0x05, 0xef, 0xce, 0xe9, 0x2b, 0x18, 0x8b, 0xf5, 0x60, 0x76, 0x19, 0x45, 0x05, 0x72, 0x8e, + 0xcd, 0xdb, 0xcf, 0xc0, 0x58, 0x4f, 0x9a, 0x95, 0xfd, 0x1b, 0x5c, 0xfc, 0xd9, 0x07, 0xc3, 0x53, + 0xf5, 0x23, 0x2f, 0x60, 0xd8, 0x00, 0x55, 0xaf, 0x43, 0x61, 0xaf, 0x01, 0xd6, 0x7d, 0x01, 0x36, + 0xdb, 0x42, 0x35, 0xf2, 0x1d, 0x4e, 0x3a, 0xf2, 0x27, 0x0f, 0x9d, 0xba, 0xc3, 0x8e, 0xea, 0xb0, + 0x73, 0x2d, 0x3a, 0x6c, 0xd9, 0x42, 0xe6, 0x7f, 0xa5, 0xa1, 0x1a, 0xf9, 0x00, 0xe3, 0x5d, 0x71, + 0x92, 0x63, 0x69, 0x41, 0x75, 0xc1, 0x7a, 0xb4, 0x96, 0xea, 0xd0, 0xf9, 0x04, 0xe3, 0x5d, 0xb1, + 0xb4, 0x75, 0x1e, 0x6f, 0xa6, 0xb0, 0x23, 0x3f, 0xaa, 0x91, 0x77, 0x40, 0xc4, 0xd1, 0xe6, 0x37, + 0x8c, 0xe4, 0xc9, 0xce, 0x37, 0x6e, 0xeb, 0x53, 0x8d, 0xbc, 0x81, 0x81, 0x6a, 0x7b, 0x27, 0xe9, + 0x81, 0x20, 0x6d, 0xfd, 0x27, 0xa8, 0x46, 0x9e, 0x89, 0x9c, 0x3b, 0x29, 0x32, 0x9f, 0xa6, 0x12, + 0x54, 0x13, 0x35, 0x6b, 0x95, 0xa0, 0x93, 0x69, 0x0a, 0xe6, 0xae, 0xc6, 0x50, 0x6d, 0xf6, 0x1c, + 0xcc, 0x24, 0x77, 0xe2, 0x82, 0x85, 0x0e, 0xab, 0x02, 0x5e, 0x05, 0x4e, 0x80, 0x59, 0xb8, 0x5c, + 0x2d, 0x8a, 0x9f, 0xb3, 0x91, 0x27, 0x27, 0x33, 0x35, 0xf0, 0xf4, 0xe0, 0x9e, 0x94, 0x7e, 0xf9, + 0x37, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x3b, 0x79, 0xb8, 0xc9, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/pb/publisher/publisher.proto b/pkg/pb/publisher/publisher.proto index 113a891..5c90a71 100644 --- a/pkg/pb/publisher/publisher.proto +++ b/pkg/pb/publisher/publisher.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package pb; option java_multiple_files = true; -option java_package = "io.grpc.gossipsub.benchmark"; -option java_outer_classname = "GossipsubBenchmark"; +option java_package = "io.grpc.pubsub.benchmark"; +option java_outer_classname = "PubsubBenchmark"; import "google/protobuf/empty.proto"; diff --git a/pkg/subnet/config/config.go b/pkg/subnet/config/config.go index 9b0ef78..bf8b33f 100644 --- a/pkg/subnet/config/config.go +++ b/pkg/subnet/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) // Load reads the passed config file location and parses it into a config struct. diff --git a/pkg/subnet/config/utils.go b/pkg/subnet/config/utils.go index 91e6c08..35e08da 100644 --- a/pkg/subnet/config/utils.go +++ b/pkg/subnet/config/utils.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" "github.com/gobuffalo/packr/v2" lcrypto "github.com/libp2p/go-libp2p-core/crypto" diff --git a/pkg/subnet/peertopology/full/full.go b/pkg/subnet/peertopology/full/full.go index 8fb03af..b252a29 100644 --- a/pkg/subnet/peertopology/full/full.go +++ b/pkg/subnet/peertopology/full/full.go @@ -1,8 +1,8 @@ package full import ( - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) // Build connects the hosts using the full topology diff --git a/pkg/subnet/peertopology/linear/linear.go b/pkg/subnet/peertopology/linear/linear.go index ba1e152..d7547a1 100644 --- a/pkg/subnet/peertopology/linear/linear.go +++ b/pkg/subnet/peertopology/linear/linear.go @@ -1,8 +1,8 @@ package linear import ( - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) // Build connects the hosts using the linear topology diff --git a/pkg/subnet/peertopology/peertopology.go b/pkg/subnet/peertopology/peertopology.go index c9298c0..f68e4e9 100644 --- a/pkg/subnet/peertopology/peertopology.go +++ b/pkg/subnet/peertopology/peertopology.go @@ -3,11 +3,11 @@ package peertopology import ( "strings" - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/logger" - "github.com/agencyenterprise/gossip-host/pkg/subnet/peertopology/full" - "github.com/agencyenterprise/gossip-host/pkg/subnet/peertopology/linear" - "github.com/agencyenterprise/gossip-host/pkg/subnet/peertopology/whiteblocks" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/peertopology/full" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/peertopology/linear" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/peertopology/whiteblocks" ) // ConnectPeersForTopology builds the specified topology diff --git a/pkg/subnet/peertopology/types.go b/pkg/subnet/peertopology/types.go index 1710f5a..a607ee1 100644 --- a/pkg/subnet/peertopology/types.go +++ b/pkg/subnet/peertopology/types.go @@ -1,8 +1,8 @@ package peertopology import ( - "github.com/agencyenterprise/gossip-host/pkg/cerr" - "github.com/agencyenterprise/gossip-host/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/cerr" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" ) const ( diff --git a/pkg/subnet/peertopology/whiteblocks/whiteblocks.go b/pkg/subnet/peertopology/whiteblocks/whiteblocks.go index 1efe880..3aab6e5 100644 --- a/pkg/subnet/peertopology/whiteblocks/whiteblocks.go +++ b/pkg/subnet/peertopology/whiteblocks/whiteblocks.go @@ -1,8 +1,8 @@ package whiteblocks import ( - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" ) // Build connects the hosts using the whiteblocks topology diff --git a/pkg/subnet/subnet.go b/pkg/subnet/subnet.go index a0e9cbe..065f497 100644 --- a/pkg/subnet/subnet.go +++ b/pkg/subnet/subnet.go @@ -7,9 +7,9 @@ import ( "os/signal" "syscall" - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/logger" - "github.com/agencyenterprise/gossip-host/pkg/subnet/peertopology" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/peertopology" ) // New returns a subnet diff --git a/pkg/subnet/types.go b/pkg/subnet/types.go index bd9d428..5adea25 100644 --- a/pkg/subnet/types.go +++ b/pkg/subnet/types.go @@ -3,9 +3,9 @@ package subnet import ( "context" - "github.com/agencyenterprise/gossip-host/pkg/cerr" - "github.com/agencyenterprise/gossip-host/pkg/host" - "github.com/agencyenterprise/gossip-host/pkg/subnet/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/cerr" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/config" ) const ( diff --git a/pkg/subnet/utils.go b/pkg/subnet/utils.go index 9f3fac6..126cf51 100644 --- a/pkg/subnet/utils.go +++ b/pkg/subnet/utils.go @@ -6,10 +6,10 @@ import ( "fmt" "net" - "github.com/agencyenterprise/gossip-host/pkg/host" - hconf "github.com/agencyenterprise/gossip-host/pkg/host/config" - "github.com/agencyenterprise/gossip-host/pkg/logger" - "github.com/agencyenterprise/gossip-host/pkg/subnet/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host" + hconf "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/host/config" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/logger" + "github.com/agencyenterprise/go-libp2p-pubsub-benchmark-tools/pkg/subnet/config" lcrypto "github.com/libp2p/go-libp2p-core/crypto" )