From 1f249662f06626f3d779a0a87830f320cfe056a6 Mon Sep 17 00:00:00 2001 From: greg stone Date: Sat, 18 Feb 2023 19:21:22 +0000 Subject: [PATCH] migrating server to seed folder. --- cmd/indra/seed.go | 10 +++++----- pkg/{server => seed}/config.go | 2 +- pkg/{server => seed}/metrics/host.go | 0 pkg/{server => seed}/server.go | 4 ++-- pkg/{server => seed}/utils.go | 2 +- pkg/{server => seed}/utils_test.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename pkg/{server => seed}/config.go (97%) rename pkg/{server => seed}/metrics/host.go (100%) rename pkg/{server => seed}/server.go (97%) rename pkg/{server => seed}/utils.go (99%) rename pkg/{server => seed}/utils_test.go (98%) diff --git a/cmd/indra/seed.go b/cmd/indra/seed.go index 1d447ef1..f559dc46 100644 --- a/cmd/indra/seed.go +++ b/cmd/indra/seed.go @@ -4,7 +4,7 @@ import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/cfg" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/server" + "git-indra.lan/indra-labs/indra/pkg/seed" "github.com/multiformats/go-multiaddr" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -50,11 +50,11 @@ var seedCmd = &cobra.Command{ log.I.Ln("-- ", log2.App, "("+viper.GetString("network")+") -", indra.SemVer, "- Network Freedom. --") var err error - var config = server.DefaultConfig + var config = seed.DefaultConfig config.Params = cfg.SelectNetworkParams(viper.GetString("network")) - if config.PrivKey, err = server.GetOrGeneratePrivKey(viper.GetString("key")); check(err) { + if config.PrivKey, err = seed.GetOrGeneratePrivKey(viper.GetString("key")); check(err) { return } @@ -70,11 +70,11 @@ var seedCmd = &cobra.Command{ config.ConnectAddresses = append(config.ConnectAddresses, multiaddr.StringCast(connector)) } - var srv *server.Server + var srv *seed.Server log.I.Ln("running serve.") - if srv, err = server.New(config); check(err) { + if srv, err = seed.New(config); check(err) { return } diff --git a/pkg/server/config.go b/pkg/seed/config.go similarity index 97% rename from pkg/server/config.go rename to pkg/seed/config.go index efcd9bb2..1ae62fac 100644 --- a/pkg/server/config.go +++ b/pkg/seed/config.go @@ -1,4 +1,4 @@ -package server +package seed import ( "git-indra.lan/indra-labs/indra/pkg/cfg" diff --git a/pkg/server/metrics/host.go b/pkg/seed/metrics/host.go similarity index 100% rename from pkg/server/metrics/host.go rename to pkg/seed/metrics/host.go diff --git a/pkg/server/server.go b/pkg/seed/server.go similarity index 97% rename from pkg/server/server.go rename to pkg/seed/server.go index b8e2b1d6..8514da8a 100644 --- a/pkg/server/server.go +++ b/pkg/seed/server.go @@ -1,4 +1,4 @@ -package server +package seed import ( "context" @@ -12,7 +12,7 @@ import ( "git-indra.lan/indra-labs/indra/pkg/interrupt" "git-indra.lan/indra-labs/indra/pkg/p2p/introducer" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/server/metrics" + "git-indra.lan/indra-labs/indra/pkg/seed/metrics" ) var ( diff --git a/pkg/server/utils.go b/pkg/seed/utils.go similarity index 99% rename from pkg/server/utils.go rename to pkg/seed/utils.go index 7cf909de..0c287984 100644 --- a/pkg/server/utils.go +++ b/pkg/seed/utils.go @@ -1,4 +1,4 @@ -package server +package seed import ( "github.com/btcsuite/btcd/btcutil/base58" diff --git a/pkg/server/utils_test.go b/pkg/seed/utils_test.go similarity index 98% rename from pkg/server/utils_test.go rename to pkg/seed/utils_test.go index 72b8fce5..dca0b302 100644 --- a/pkg/server/utils_test.go +++ b/pkg/seed/utils_test.go @@ -1,4 +1,4 @@ -package server +package seed import ( "crypto/rand"