From 3c85e6e56adce271a422d9cc5517a187edfc101a Mon Sep 17 00:00:00 2001
From: Roy Lee <roylee17@gmail.com>
Date: Sat, 10 Jul 2021 16:24:02 -0700
Subject: [PATCH] [lbry] claimtrie: minor refactoring of claimtrie CLI

---
 claimtrie/cmd/cmd/block.go    | 11 ++---------
 claimtrie/cmd/cmd/node.go     |  5 -----
 claimtrie/cmd/cmd/root.go     | 11 +++++++++++
 claimtrie/cmd/cmd/temporal.go |  5 -----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/claimtrie/cmd/cmd/block.go b/claimtrie/cmd/cmd/block.go
index 6d9891ca..75e81f1d 100644
--- a/claimtrie/cmd/cmd/block.go
+++ b/claimtrie/cmd/cmd/block.go
@@ -6,22 +6,15 @@ import (
 	"strconv"
 
 	"github.com/btcsuite/btcd/claimtrie/block/blockrepo"
-	"github.com/btcsuite/btcd/claimtrie/config"
 	"github.com/btcsuite/btcd/claimtrie/merkletrie"
 	"github.com/btcsuite/btcd/claimtrie/merkletrie/merkletrierepo"
 	"github.com/btcsuite/btcd/claimtrie/param"
 	"github.com/btcsuite/btcd/claimtrie/temporal/temporalrepo"
-	"github.com/btcsuite/btcd/wire"
 
 	"github.com/spf13/cobra"
 )
 
-var localConfig *config.DBConfig
-
 func init() {
-	param.SetNetwork(wire.MainNet, "mainnet")
-	localConfig = config.GenerateConfig(param.ClaimtrieDataFolder)
-
 	rootCmd.AddCommand(blockCmd)
 
 	blockCmd.AddCommand(blockLastCmd)
@@ -106,9 +99,9 @@ var blockListCmd = &cobra.Command{
 }
 
 var blockNameCmd = &cobra.Command{
-	Use:   "vertex <height> [<name>]",
+	Use:   "vertex <height> <name>",
 	Short: "List the claim and child hashes at vertex name of block at height",
-	Args:  cobra.RangeArgs(1, 2),
+	Args:  cobra.RangeArgs(2, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {
 
 		repo, err := blockrepo.NewPebble(localConfig.BlockRepoPebble.Path)
diff --git a/claimtrie/cmd/cmd/node.go b/claimtrie/cmd/cmd/node.go
index 426d1d45..9af78742 100644
--- a/claimtrie/cmd/cmd/node.go
+++ b/claimtrie/cmd/cmd/node.go
@@ -5,18 +5,13 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/btcsuite/btcd/claimtrie/config"
 	"github.com/btcsuite/btcd/claimtrie/node"
 	"github.com/btcsuite/btcd/claimtrie/node/noderepo"
-	"github.com/btcsuite/btcd/claimtrie/param"
-	"github.com/btcsuite/btcd/wire"
 
 	"github.com/spf13/cobra"
 )
 
 func init() {
-	param.SetNetwork(wire.MainNet, "mainnet")
-	localConfig = config.GenerateConfig(param.ClaimtrieDataFolder)
 	rootCmd.AddCommand(nodeCmd)
 
 	nodeCmd.AddCommand(nodeDumpCmd)
diff --git a/claimtrie/cmd/cmd/root.go b/claimtrie/cmd/cmd/root.go
index 3cd9ff9b..4a05534c 100644
--- a/claimtrie/cmd/cmd/root.go
+++ b/claimtrie/cmd/cmd/root.go
@@ -1,9 +1,20 @@
 package cmd
 
 import (
+	"github.com/btcsuite/btcd/claimtrie/config"
+	"github.com/btcsuite/btcd/claimtrie/param"
+	"github.com/btcsuite/btcd/wire"
+
 	"github.com/spf13/cobra"
 )
 
+var localConfig *config.DBConfig
+
+func init() {
+	param.SetNetwork(wire.MainNet, "mainnet")
+	localConfig = config.GenerateConfig(param.ClaimtrieDataFolder)
+}
+
 var rootCmd = &cobra.Command{
 	Use:          "claimtrie",
 	Short:        "ClaimTrie Command Line Interface",
diff --git a/claimtrie/cmd/cmd/temporal.go b/claimtrie/cmd/cmd/temporal.go
index 394b6553..3254d4c2 100644
--- a/claimtrie/cmd/cmd/temporal.go
+++ b/claimtrie/cmd/cmd/temporal.go
@@ -5,17 +5,12 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/btcsuite/btcd/claimtrie/config"
-	"github.com/btcsuite/btcd/claimtrie/param"
 	"github.com/btcsuite/btcd/claimtrie/temporal/temporalrepo"
-	"github.com/btcsuite/btcd/wire"
 
 	"github.com/spf13/cobra"
 )
 
 func init() {
-	param.SetNetwork(wire.MainNet, "mainnet")
-	localConfig = config.GenerateConfig(param.ClaimtrieDataFolder)
 	rootCmd.AddCommand(temporalCmd)
 }