From eb495e081b1cc0b690824a9b9f018b7c27f62cd2 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Tue, 18 Jul 2017 21:57:37 +0200 Subject: [PATCH] Move commands to client/commands --- {commands => client/commands}/common.go | 0 {commands => client/commands}/init.go | 0 {commands => client/commands}/proofs/get.go | 2 +- {commands => client/commands}/proofs/root.go | 0 {commands => client/commands}/proofs/state.go | 2 +- {commands => client/commands}/proofs/tx.go | 2 +- {commands => client/commands}/proxy/root.go | 2 +- {commands => client/commands}/rpc/helpers.go | 2 +- {commands => client/commands}/rpc/insecure.go | 2 +- {commands => client/commands}/rpc/root.go | 2 +- {commands => client/commands}/rpc/secure.go | 2 +- {commands => client/commands}/seeds/export.go | 2 +- {commands => client/commands}/seeds/import.go | 2 +- {commands => client/commands}/seeds/root.go | 0 {commands => client/commands}/seeds/show.go | 2 +- {commands => client/commands}/seeds/update.go | 2 +- {commands => client/commands}/txs/helpers.go | 2 +- {commands => client/commands}/txs/root.go | 0 cmd/basecli/commands/cmds.go | 2 +- cmd/basecli/main.go | 12 ++++++------ .../guide/counter/cmd/countercli/commands/counter.go | 2 +- docs/guide/counter/cmd/countercli/commands/query.go | 2 +- docs/guide/counter/cmd/countercli/main.go | 10 +++++----- modules/base/commands/wrap.go | 2 +- modules/coin/commands/query.go | 4 ++-- modules/coin/commands/tx.go | 4 ++-- modules/nonce/commands/query.go | 4 ++-- 27 files changed, 34 insertions(+), 34 deletions(-) rename {commands => client/commands}/common.go (100%) rename {commands => client/commands}/init.go (100%) rename {commands => client/commands}/proofs/get.go (98%) rename {commands => client/commands}/proofs/root.go (100%) rename {commands => client/commands}/proofs/state.go (96%) rename {commands => client/commands}/proofs/tx.go (96%) rename {commands => client/commands}/proxy/root.go (98%) rename {commands => client/commands}/rpc/helpers.go (95%) rename {commands => client/commands}/rpc/insecure.go (96%) rename {commands => client/commands}/rpc/root.go (96%) rename {commands => client/commands}/rpc/secure.go (96%) rename {commands => client/commands}/seeds/export.go (95%) rename {commands => client/commands}/seeds/import.go (96%) rename {commands => client/commands}/seeds/root.go (100%) rename {commands => client/commands}/seeds/show.go (97%) rename {commands => client/commands}/seeds/update.go (94%) rename {commands => client/commands}/txs/helpers.go (98%) rename {commands => client/commands}/txs/root.go (100%) diff --git a/commands/common.go b/client/commands/common.go similarity index 100% rename from commands/common.go rename to client/commands/common.go diff --git a/commands/init.go b/client/commands/init.go similarity index 100% rename from commands/init.go rename to client/commands/init.go diff --git a/commands/proofs/get.go b/client/commands/proofs/get.go similarity index 98% rename from commands/proofs/get.go rename to client/commands/proofs/get.go index 846a4e7504..c670e7b3ee 100644 --- a/commands/proofs/get.go +++ b/client/commands/proofs/get.go @@ -12,7 +12,7 @@ import ( "github.com/tendermint/tendermint/rpc/client" lc "github.com/tendermint/light-client" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" "github.com/tendermint/light-client/proofs" ) diff --git a/commands/proofs/root.go b/client/commands/proofs/root.go similarity index 100% rename from commands/proofs/root.go rename to client/commands/proofs/root.go diff --git a/commands/proofs/state.go b/client/commands/proofs/state.go similarity index 96% rename from commands/proofs/state.go rename to client/commands/proofs/state.go index f6dce1dc03..6f7109d013 100644 --- a/commands/proofs/state.go +++ b/client/commands/proofs/state.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/go-wire/data" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" "github.com/tendermint/light-client/proofs" ) diff --git a/commands/proofs/tx.go b/client/commands/proofs/tx.go similarity index 96% rename from commands/proofs/tx.go rename to client/commands/proofs/tx.go index 5009a8149f..7dc21af050 100644 --- a/commands/proofs/tx.go +++ b/client/commands/proofs/tx.go @@ -3,7 +3,7 @@ package proofs import ( "github.com/spf13/cobra" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" "github.com/tendermint/light-client/proofs" ) diff --git a/commands/proxy/root.go b/client/commands/proxy/root.go similarity index 98% rename from commands/proxy/root.go rename to client/commands/proxy/root.go index 4897df816e..0284f4dbe8 100644 --- a/commands/proxy/root.go +++ b/client/commands/proxy/root.go @@ -15,7 +15,7 @@ import ( rpc "github.com/tendermint/tendermint/rpc/lib/server" certclient "github.com/tendermint/light-client/certifiers/client" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) // RootCmd represents the base command when called without any subcommands diff --git a/commands/rpc/helpers.go b/client/commands/rpc/helpers.go similarity index 95% rename from commands/rpc/helpers.go rename to client/commands/rpc/helpers.go index 8fa374916e..5ef0f4f3ef 100644 --- a/commands/rpc/helpers.go +++ b/client/commands/rpc/helpers.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" "github.com/tendermint/tendermint/rpc/client" ) diff --git a/commands/rpc/insecure.go b/client/commands/rpc/insecure.go similarity index 96% rename from commands/rpc/insecure.go rename to client/commands/rpc/insecure.go index c8054fe1b3..80432f95e7 100644 --- a/commands/rpc/insecure.go +++ b/client/commands/rpc/insecure.go @@ -2,7 +2,7 @@ package rpc import ( "github.com/spf13/cobra" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) var statusCmd = &cobra.Command{ diff --git a/commands/rpc/root.go b/client/commands/rpc/root.go similarity index 96% rename from commands/rpc/root.go rename to client/commands/rpc/root.go index 2da71392ee..471744b2fe 100644 --- a/commands/rpc/root.go +++ b/client/commands/rpc/root.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/rpc/client" certclient "github.com/tendermint/light-client/certifiers/client" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) const ( diff --git a/commands/rpc/secure.go b/client/commands/rpc/secure.go similarity index 96% rename from commands/rpc/secure.go rename to client/commands/rpc/secure.go index da405e78a0..d49504143c 100644 --- a/commands/rpc/secure.go +++ b/client/commands/rpc/secure.go @@ -3,7 +3,7 @@ package rpc import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) func init() { diff --git a/commands/seeds/export.go b/client/commands/seeds/export.go similarity index 95% rename from commands/seeds/export.go rename to client/commands/seeds/export.go index 14b082bd4b..a4c453526e 100644 --- a/commands/seeds/export.go +++ b/client/commands/seeds/export.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) var exportCmd = &cobra.Command{ diff --git a/commands/seeds/import.go b/client/commands/seeds/import.go similarity index 96% rename from commands/seeds/import.go rename to client/commands/seeds/import.go index add67a666a..2731324d90 100644 --- a/commands/seeds/import.go +++ b/client/commands/seeds/import.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/tendermint/light-client/certifiers" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) const ( diff --git a/commands/seeds/root.go b/client/commands/seeds/root.go similarity index 100% rename from commands/seeds/root.go rename to client/commands/seeds/root.go diff --git a/commands/seeds/show.go b/client/commands/seeds/show.go similarity index 97% rename from commands/seeds/show.go rename to client/commands/seeds/show.go index 2b2c7c7169..5ea8287e8a 100644 --- a/commands/seeds/show.go +++ b/client/commands/seeds/show.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/tendermint/light-client/certifiers" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) const ( diff --git a/commands/seeds/update.go b/client/commands/seeds/update.go similarity index 94% rename from commands/seeds/update.go rename to client/commands/seeds/update.go index ada8fe41f6..575ede4ac2 100644 --- a/commands/seeds/update.go +++ b/client/commands/seeds/update.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/light-client/certifiers" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" ) var updateCmd = &cobra.Command{ diff --git a/commands/txs/helpers.go b/client/commands/txs/helpers.go similarity index 98% rename from commands/txs/helpers.go rename to client/commands/txs/helpers.go index 9426fa7684..3a592a4509 100644 --- a/commands/txs/helpers.go +++ b/client/commands/txs/helpers.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" crypto "github.com/tendermint/go-crypto" keycmd "github.com/tendermint/go-crypto/cmd" "github.com/tendermint/go-crypto/keys" diff --git a/commands/txs/root.go b/client/commands/txs/root.go similarity index 100% rename from commands/txs/root.go rename to client/commands/txs/root.go diff --git a/cmd/basecli/commands/cmds.go b/cmd/basecli/commands/cmds.go index 19e685e3b0..c0ba9a6e0a 100644 --- a/cmd/basecli/commands/cmds.go +++ b/cmd/basecli/commands/cmds.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/pflag" - txcmd "github.com/tendermint/basecoin/commands/txs" + txcmd "github.com/tendermint/basecoin/client/commands/txs" cmn "github.com/tendermint/tmlibs/common" ctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/cmd/basecli/main.go b/cmd/basecli/main.go index acaaa1a7e7..491c5cbeeb 100644 --- a/cmd/basecli/main.go +++ b/cmd/basecli/main.go @@ -8,12 +8,12 @@ import ( "github.com/tendermint/abci/version" keycmd "github.com/tendermint/go-crypto/cmd" - "github.com/tendermint/basecoin/commands" - "github.com/tendermint/basecoin/commands/proofs" - "github.com/tendermint/basecoin/commands/proxy" - rpccmd "github.com/tendermint/basecoin/commands/rpc" - "github.com/tendermint/basecoin/commands/seeds" - "github.com/tendermint/basecoin/commands/txs" + "github.com/tendermint/basecoin/client/commands" + "github.com/tendermint/basecoin/client/commands/proofs" + "github.com/tendermint/basecoin/client/commands/proxy" + rpccmd "github.com/tendermint/basecoin/client/commands/rpc" + "github.com/tendermint/basecoin/client/commands/seeds" + "github.com/tendermint/basecoin/client/commands/txs" "github.com/tendermint/tmlibs/cli" bcmd "github.com/tendermint/basecoin/cmd/basecli/commands" diff --git a/docs/guide/counter/cmd/countercli/commands/counter.go b/docs/guide/counter/cmd/countercli/commands/counter.go index c4336d1119..bb66d4c074 100644 --- a/docs/guide/counter/cmd/countercli/commands/counter.go +++ b/docs/guide/counter/cmd/countercli/commands/counter.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - txcmd "github.com/tendermint/basecoin/commands/txs" + txcmd "github.com/tendermint/basecoin/client/commands/txs" "github.com/tendermint/basecoin" bcmd "github.com/tendermint/basecoin/cmd/basecli/commands" diff --git a/docs/guide/counter/cmd/countercli/commands/query.go b/docs/guide/counter/cmd/countercli/commands/query.go index 07a8620e84..8debaf9c2b 100644 --- a/docs/guide/counter/cmd/countercli/commands/query.go +++ b/docs/guide/counter/cmd/countercli/commands/query.go @@ -3,7 +3,7 @@ package commands import ( "github.com/spf13/cobra" - proofcmd "github.com/tendermint/basecoin/commands/proofs" + proofcmd "github.com/tendermint/basecoin/client/commands/proofs" "github.com/tendermint/basecoin/docs/guide/counter/plugins/counter" "github.com/tendermint/basecoin/stack" diff --git a/docs/guide/counter/cmd/countercli/main.go b/docs/guide/counter/cmd/countercli/main.go index b3cd915b0c..8440372f77 100644 --- a/docs/guide/counter/cmd/countercli/main.go +++ b/docs/guide/counter/cmd/countercli/main.go @@ -6,11 +6,11 @@ import ( "github.com/spf13/cobra" keycmd "github.com/tendermint/go-crypto/cmd" - "github.com/tendermint/basecoin/commands" - "github.com/tendermint/basecoin/commands/proofs" - "github.com/tendermint/basecoin/commands/proxy" - "github.com/tendermint/basecoin/commands/seeds" - "github.com/tendermint/basecoin/commands/txs" + "github.com/tendermint/basecoin/client/commands" + "github.com/tendermint/basecoin/client/commands/proofs" + "github.com/tendermint/basecoin/client/commands/proxy" + "github.com/tendermint/basecoin/client/commands/seeds" + "github.com/tendermint/basecoin/client/commands/txs" "github.com/tendermint/tmlibs/cli" bcmd "github.com/tendermint/basecoin/cmd/basecli/commands" diff --git a/modules/base/commands/wrap.go b/modules/base/commands/wrap.go index 3367cc70ff..13b6b7f342 100644 --- a/modules/base/commands/wrap.go +++ b/modules/base/commands/wrap.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/tendermint/basecoin/commands" + "github.com/tendermint/basecoin/client/commands" "github.com/tendermint/basecoin" bcmd "github.com/tendermint/basecoin/cmd/basecli/commands" diff --git a/modules/coin/commands/query.go b/modules/coin/commands/query.go index 8edd96c2d4..8f5ef70409 100644 --- a/modules/coin/commands/query.go +++ b/modules/coin/commands/query.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" lc "github.com/tendermint/light-client" - lcmd "github.com/tendermint/basecoin/commands" - proofcmd "github.com/tendermint/basecoin/commands/proofs" + lcmd "github.com/tendermint/basecoin/client/commands" + proofcmd "github.com/tendermint/basecoin/client/commands/proofs" "github.com/tendermint/basecoin/modules/auth" "github.com/tendermint/basecoin/modules/coin" diff --git a/modules/coin/commands/tx.go b/modules/coin/commands/tx.go index 566901f2ff..4fd7037cf7 100644 --- a/modules/coin/commands/tx.go +++ b/modules/coin/commands/tx.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/basecoin/commands" - txcmd "github.com/tendermint/basecoin/commands/txs" + "github.com/tendermint/basecoin/client/commands" + txcmd "github.com/tendermint/basecoin/client/commands/txs" "github.com/tendermint/basecoin" bcmd "github.com/tendermint/basecoin/cmd/basecli/commands" diff --git a/modules/nonce/commands/query.go b/modules/nonce/commands/query.go index 79e7695c45..2bca14b99d 100644 --- a/modules/nonce/commands/query.go +++ b/modules/nonce/commands/query.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" lc "github.com/tendermint/light-client" - lcmd "github.com/tendermint/basecoin/commands" - proofcmd "github.com/tendermint/basecoin/commands/proofs" + lcmd "github.com/tendermint/basecoin/client/commands" + proofcmd "github.com/tendermint/basecoin/client/commands/proofs" "github.com/tendermint/basecoin/modules/nonce" "github.com/tendermint/basecoin/stack"