diff --git a/client/client.go b/client/client.go index e2ab5baa..ebca4d4c 100644 --- a/client/client.go +++ b/client/client.go @@ -12,6 +12,7 @@ import ( "sync" "time" + "github.com/ava-labs/avalanche-network-runner/local" "github.com/ava-labs/avalanche-network-runner/pkg/color" "github.com/ava-labs/avalanche-network-runner/pkg/logutil" "github.com/ava-labs/avalanche-network-runner/rpcpb" @@ -93,7 +94,7 @@ func (c *client) Ping(ctx context.Context) (*rpcpb.PingResponse, error) { } func (c *client) Start(ctx context.Context, execPath string, opts ...OpOption) (*rpcpb.StartResponse, error) { - ret := &Op{numNodes: local.defaultNumNodes} + ret := &Op{numNodes: local.DefaultNumNodes} ret.applyOpts(opts) zap.L().Info("start") diff --git a/cmd/avalanche-network-runner/control/control.go b/cmd/avalanche-network-runner/control/control.go index f0f61f98..6051b298 100644 --- a/cmd/avalanche-network-runner/control/control.go +++ b/cmd/avalanche-network-runner/control/control.go @@ -11,6 +11,7 @@ import ( "time" "github.com/ava-labs/avalanche-network-runner/client" + "github.com/ava-labs/avalanche-network-runner/local" "github.com/ava-labs/avalanche-network-runner/pkg/color" "github.com/ava-labs/avalanche-network-runner/pkg/logutil" "github.com/spf13/cobra" @@ -74,7 +75,7 @@ func newStartCommand() *cobra.Command { cmd.PersistentFlags().Uint32Var( &numNodes, "number-of-nodes", - local.defaultNumNodes, + local.DefaultNumNodes, "number of nodes of the network", ) cmd.PersistentFlags().StringVar( diff --git a/local/network.go b/local/network.go index ef1f802e..25c017c0 100644 --- a/local/network.go +++ b/local/network.go @@ -35,7 +35,7 @@ const ( genesisFileName = "genesis.json" stopTimeout = 30 * time.Second healthCheckFreq = 3 * time.Second - defaultNumNodes = 5 + DefaultNumNodes = 5 ) // interface compliance @@ -101,7 +101,7 @@ func init() { defaultNetworkConfig = network.Config{ Name: "my network", - NodeConfigs: make([]node.Config, defaultNumNodes), + NodeConfigs: make([]node.Config, DefaultNumNodes), LogLevel: "INFO", } diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 0f963565..93604b37 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -17,8 +17,6 @@ import ( "github.com/onsi/gomega" ) -const numNodes = 5 - func TestE2e(t *testing.T) { gomega.RegisterFailHandler(ginkgo.Fail) ginkgo.RunSpecs(t, "network-runner-example e2e test suites") @@ -93,7 +91,7 @@ var _ = ginkgo.Describe("[Start/Remove/Restart/Stop]", func() { ginkgo.It("can start", func() { ginkgo.By("calling start API with the first binary", func() { ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) - resp, err := cli.Start(ctx, execPath1, numNodes) + resp, err := cli.Start(ctx, execPath1) cancel() gomega.Ω(err).Should(gomega.BeNil()) color.Outf("{{green}}successfully started:{{/}} %+v\n", resp.ClusterInfo.NodeNames)