From 0b0500e8a0d02a486beff27a2c744211df2bc375 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Wed, 7 Feb 2018 17:22:49 +0100
Subject: [PATCH] Rebased on develop, fixed imports

---
 examples/chub/main.go | 4 ++--
 examples/chub/node.go | 6 +++---
 glide.lock            | 4 ++++
 glide.yaml            | 4 ++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/examples/chub/main.go b/examples/chub/main.go
index bcd826a27..a39274f40 100644
--- a/examples/chub/main.go
+++ b/examples/chub/main.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/tendermint/tmlibs/cli"
 
-	"github.com/cosmos/cosmos-sdk/app"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 )
 
 const (
@@ -54,7 +54,7 @@ func main() {
 	cobra.EnableCommandSorting = false
 
 	// TODO: set this to something real
-	var node app.App
+	var node baseapp.BaseApp
 
 	// add commands
 	AddGetCommand(getAccountCmd)
diff --git a/examples/chub/node.go b/examples/chub/node.go
index e0c865cfe..1b73c82d6 100644
--- a/examples/chub/node.go
+++ b/examples/chub/node.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/cosmos/cosmos-sdk/app"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 )
 
 const (
@@ -28,7 +28,7 @@ var (
 // a local full-node.
 //
 // Accept an application it should start
-func NodeCommands(node app.App) *cobra.Command {
+func NodeCommands(node baseapp.BaseApp) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "node",
 		Short: "Run the full node",
@@ -41,7 +41,7 @@ func NodeCommands(node app.App) *cobra.Command {
 	return cmd
 }
 
-func startNodeCmd(node app.App) *cobra.Command {
+func startNodeCmd(node baseapp.BaseApp) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "start",
 		Short: "Run the full node",
diff --git a/glide.lock b/glide.lock
index 2ce3afb93..774f3143e 100644
--- a/glide.lock
+++ b/glide.lock
@@ -46,6 +46,10 @@ imports:
   version: 645ef00459ed84a119197bfb8d8205042c6df63d
 - name: github.com/rigelrozanski/common
   version: f691f115798593d783b9999b1263c2f4ffecc439
+- name: github.com/spf13/cobra
+  version: 93959269ad99e80983c9ba742a7e01203a4c0e4f
+- name: github.com/spf13/viper
+  version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
 - name: github.com/syndtr/goleveldb
   version: 211f780988068502fe874c44dae530528ebd840f
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index ea7856ff2..94dba7dda 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -28,6 +28,10 @@ import:
 - package: golang.org/x/crypto
   subpackages:
   - ripemd160
+- package: github.com/spf13/cobra
+  version: ~0.0.1
+- package: github.com/spf13/viper
+  version: ^1.0.0
 testImport:
 - package: github.com/stretchr/testify
   version: ^1.2.1