Remove remnants of basecoin tx as ibc functions are now under relay

cmd/basecoin/main.go

@@ -19,7 +19,6 @@ func main() {
 		commands.InitCmd,
 		commands.StartCmd,
 		commands.RelayCmd,
-		commands.TxCmd,
 		commands.UnsafeResetAllCmd,
 		commands.VersionCmd,
 	)

cmd/commands/ibc.go

@@ -1,87 +1,8 @@
 package commands
 
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-
-	"github.com/tendermint/basecoin/plugins/ibc"
-
-	"github.com/tendermint/go-wire"
-)
+import "github.com/tendermint/basecoin/plugins/ibc"
 
 // returns a new IBC plugin to be registered with Basecoin
 func NewIBCPlugin() *ibc.IBCPlugin {
 	return ibc.New()
 }
-
-//commands
-var (
-	IBCTxCmd = &cobra.Command{
-		Use:   "ibc",
-		Short: "An IBC transaction, for InterBlockchain Communication",
-	}
-
-	IBCRegisterTxCmd = &cobra.Command{
-		Use:   "register",
-		Short: "Register a blockchain via IBC",
-		RunE:  ibcRegisterTxCmd,
-	}
-)
-
-//flags
-var (
-	ibcChainIDFlag string
-	ibcGenesisFlag string
-)
-
-func init() {
-	// register flags
-	registerFlags := []Flag2Register{
-		{&ibcChainIDFlag, "ibc_chain_id", "", "ChainID for the new blockchain"},
-		{&ibcGenesisFlag, "genesis", "", "Genesis file for the new blockchain"},
-	}
-
-	RegisterFlags(IBCRegisterTxCmd, registerFlags)
-
-	//register commands
-	IBCTxCmd.AddCommand(IBCRegisterTxCmd)
-	RegisterTxSubcommand(IBCTxCmd)
-}
-
-//---------------------------------------------------------------------
-// ibc command implementations
-
-func ibcRegisterTxCmd(cmd *cobra.Command, args []string) error {
-	chainID := ibcChainIDFlag
-	genesisFile := ibcGenesisFlag
-
-	genesisBytes, err := ioutil.ReadFile(genesisFile)
-	if err != nil {
-		return errors.Errorf("Error reading genesis file %v: %v\n", genesisFile, err)
-	}
-
-	ibcTx := ibc.IBCRegisterChainTx{
-		ibc.BlockchainGenesis{
-			ChainID: chainID,
-			Genesis: string(genesisBytes),
-		},
-	}
-
-	out, err := json.Marshal(ibcTx)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("IBCTx: %s\n", string(out))
-
-	data := []byte(wire.BinaryBytes(struct {
-		ibc.IBCTx `json:"unwrap"`
-	}{ibcTx}))
-	name := "IBC"
-
-	return AppTx(name, data)
-}

cmd/commands/plugin_util.go

@@ -19,11 +19,6 @@ func RegisterStartPlugin(name string, newPlugin func() types.Plugin) {
 	plugins = append(plugins, plugin{name: name, newPlugin: newPlugin})
 }
 
-// Register a subcommand of TxCmd to craft transactions for plugins
-func RegisterTxSubcommand(cmd *cobra.Command) {
-	TxCmd.AddCommand(cmd)
-}
-
 //Returns a version command based on version input
 func QuickVersionCmd(version string) *cobra.Command {
 	return &cobra.Command{

cmd/commands/relay.go

@@ -118,7 +118,7 @@ func loop(addr1, addr2, id1, id2 string) {
 	nextSeq := 0
 
 	// load the priv key
-	privKey, err := LoadKey(fromFlag)
+	privKey, err := LoadKey(fromFileFlag)
 	if err != nil {
 		logger.Error(err.Error())
 		cmn.PanicCrisis(err.Error())

cmd/counter/cmd.go

@@ -1,59 +1,11 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	wire "github.com/tendermint/go-wire"
-
 	"github.com/tendermint/basecoin/cmd/commands"
 	"github.com/tendermint/basecoin/plugins/counter"
 	"github.com/tendermint/basecoin/types"
 )
 
-//commands
-var CounterTxCmd = &cobra.Command{
-	Use:   "counter",
-	Short: "Create, sign, and broadcast a transaction to the counter plugin",
-	RunE:  counterTxCmd,
-}
-
-const (
-	flagValid    = "valid"
-	flagCountFee = "countfee"
-)
-
 func init() {
-
-	CounterTxCmd.Flags().Bool(flagValid, false, "Set valid field in CounterTx")
-	CounterTxCmd.Flags().String(flagCountFee, "", "Coins for the counter fee of the format <amt><coin>")
-
-	commands.RegisterTxSubcommand(CounterTxCmd)
 	commands.RegisterStartPlugin("counter", func() types.Plugin { return counter.New() })
 }
-
-func counterTxCmd(cmd *cobra.Command, args []string) error {
-
-	countFee, err := types.ParseCoins(viper.GetString(flagCountFee))
-	if err != nil {
-		return err
-	}
-
-	counterTx := counter.CounterTx{
-		Valid: viper.GetBool(flagValid),
-		Fee:   countFee,
-	}
-
-	out, err := json.Marshal(counterTx)
-	if err != nil {
-		return err
-	}
-	fmt.Println("CounterTx:", string(out))
-
-	data := wire.BinaryBytes(counterTx)
-	name := "counter"
-
-	return commands.AppTx(name, data)
-}

cmd/counter/main.go

@@ -18,7 +18,6 @@ func main() {
 	RootCmd.AddCommand(
 		commands.InitCmd,
 		commands.StartCmd,
-		commands.TxCmd,
 		commands.UnsafeResetAllCmd,
 		commands.VersionCmd,
 	)