Update binaries to use our key commands, not the ones from go-crypto

client/commands/keys/delete.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import (
 	"fmt"

client/commands/keys/get.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import (
 	"github.com/pkg/errors"

client/commands/keys/list.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import "github.com/spf13/cobra"
 

client/commands/keys/new.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import (
 	"fmt"

client/commands/keys/recover.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import (
 	"github.com/pkg/errors"

client/commands/keys/root.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import (
 	"github.com/spf13/cobra"

client/commands/keys/update.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package keys
 
 import (
 	"fmt"

client/commands/keys/utils.go

@@ -1,4 +1,4 @@
-package cmd
+package keys
 
 import (
 	"bufio"

client/commands/txs/helpers.go

@@ -10,12 +10,11 @@ import (
 	"strings"
 
 	"github.com/bgentry/speakeasy"
-	"github.com/mattn/go-isatty"
+	isatty "github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 
 	crypto "github.com/tendermint/go-crypto"
-	keycmd "github.com/tendermint/go-crypto/cmd"
 	"github.com/tendermint/go-crypto/keys"
 	wire "github.com/tendermint/go-wire"
 	"github.com/tendermint/go-wire/data"
@@ -24,6 +23,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk"
 	"github.com/cosmos/cosmos-sdk/client/commands"
+	keycmd "github.com/cosmos/cosmos-sdk/client/commands/keys"
 	"github.com/cosmos/cosmos-sdk/modules/auth"
 )
 

client/rest/handlers.go

@@ -6,10 +6,11 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	sdk "github.com/cosmos/cosmos-sdk"
-	keysutils "github.com/tendermint/go-crypto/cmd"
 	keys "github.com/tendermint/go-crypto/keys"
 	"github.com/tendermint/tmlibs/common"
+
+	sdk "github.com/cosmos/cosmos-sdk"
+	keycmd "github.com/cosmos/cosmos-sdk/client/commands/keys"
 )
 
 type Keys struct {
@@ -18,7 +19,7 @@ type Keys struct {
 }
 
 func DefaultKeysManager() keys.Manager {
-	return keysutils.GetKeyManager()
+	return keycmd.GetKeyManager()
 }
 
 func NewDefaultKeysManager(algo string) *Keys {

client/rest/helpers.go

@@ -1,7 +1,6 @@
 package rest
 
 import (
-	keycmd "github.com/tendermint/go-crypto/cmd"
 	"github.com/tendermint/go-crypto/keys"
 	wire "github.com/tendermint/go-wire"
 
@@ -9,6 +8,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk"
 	"github.com/cosmos/cosmos-sdk/client/commands"
+	keycmd "github.com/cosmos/cosmos-sdk/client/commands/keys"
 )
 
 // PostTx is same as a tx

examples/basecoin/cmd/basecli/main.go

@@ -5,11 +5,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	keycmd "github.com/tendermint/go-crypto/cmd"
 	"github.com/tendermint/tmlibs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client/commands"
 	"github.com/cosmos/cosmos-sdk/client/commands/auto"
+	"github.com/cosmos/cosmos-sdk/client/commands/keys"
 	"github.com/cosmos/cosmos-sdk/client/commands/proxy"
 	"github.com/cosmos/cosmos-sdk/client/commands/query"
 	rpccmd "github.com/cosmos/cosmos-sdk/client/commands/rpc"
@@ -76,7 +76,7 @@ func main() {
 	BaseCli.AddCommand(
 		commands.InitCmd,
 		commands.ResetCmd,
-		keycmd.RootCmd,
+		keys.RootCmd,
 		seeds.RootCmd,
 		rpccmd.RootCmd,
 		query.RootCmd,

examples/counter/cmd/countercli/main.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	keycmd "github.com/tendermint/go-crypto/cmd"
 	"github.com/tendermint/tmlibs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client/commands"
+	"github.com/cosmos/cosmos-sdk/client/commands/keys"
 	"github.com/cosmos/cosmos-sdk/client/commands/proxy"
 	"github.com/cosmos/cosmos-sdk/client/commands/query"
 	"github.com/cosmos/cosmos-sdk/client/commands/seeds"
@@ -73,7 +73,7 @@ func main() {
 		commands.InitCmd,
 		commands.ResetCmd,
 		commands.VersionCmd,
-		keycmd.RootCmd,
+		keys.RootCmd,
 		seeds.RootCmd,
 		query.RootCmd,
 		txcmd.RootCmd,

examples/eyes/cmd/eyescli/main.go

@@ -5,12 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	keycmd "github.com/tendermint/go-crypto/cmd"
 	"github.com/tendermint/tmlibs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client/commands"
 	"github.com/cosmos/cosmos-sdk/client/commands/auto"
-	"github.com/cosmos/cosmos-sdk/client/commands/proxy"
 	"github.com/cosmos/cosmos-sdk/client/commands/query"
 	rpccmd "github.com/cosmos/cosmos-sdk/client/commands/rpc"
 	"github.com/cosmos/cosmos-sdk/client/commands/seeds"
@@ -52,12 +50,10 @@ func main() {
 		// we use out own init command to not require address arg
 		commands.InitCmd,
 		commands.ResetCmd,
-		keycmd.RootCmd,
 		seeds.RootCmd,
 		rpccmd.RootCmd,
 		query.RootCmd,
 		txcmd.RootCmd,
-		proxy.RootCmd,
 		commands.VersionCmd,
 		auto.AutoCompleteCmd,
 	)