Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ var diagnosticsSync = func() *fctCmd {
cmd.execFunc = func(args []string) {
os.Args = args
sdisp := flag.Bool("S", false, "display only the syncing status")
rdisp := flag.Bool("R", false, "display only the recieved status")
rdisp := flag.Bool("R", false, "display only the received status")
edisp := flag.Bool("E", false, "display only the expected status")
flag.Parse()
args = flag.Args()
Expand All @@ -173,7 +173,7 @@ var diagnosticsSync = func() *fctCmd {
fmt.Println(d.SyncInfo.Expected)
default:
fmt.Println("Status:", d.SyncInfo.Status)
fmt.Println("Recieved:", d.SyncInfo.Received)
fmt.Println("Received:", d.SyncInfo.Received)
fmt.Println("Expected:", d.SyncInfo.Expected)
for _, m := range d.SyncInfo.Missing {
fmt.Println("Missing:", m)
Expand Down
6 changes: 3 additions & 3 deletions get.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ var getChainHead = func() *fctCmd {

var getABlock = func() *fctCmd {
cmd := new(fctCmd)
cmd.helpMsg = "factom-cli get ABlock [-RDBPL] HEIGHT|KEYMR"
cmd.helpMsg = "factom-cli get ablock [-RDBPL] HEIGHT|KEYMR"
cmd.description = "Get an Admin Block from factom by its Key Merkel Root " +
"or by its Height"
cmd.completion = complete.Command{
Expand Down Expand Up @@ -279,7 +279,7 @@ var getABlock = func() *fctCmd {
case *ddisp:
fmt.Println(ablock.DBHeight)
case *bdisp:
fmt.Println(ablock.BackReverenceHash)
fmt.Println(ablock.BackReferenceHash)
case *pdisp:
fmt.Println(ablock.PrevBackreferenceHash)
case *ldisp:
Expand Down Expand Up @@ -503,7 +503,7 @@ var getECBlock = func() *fctCmd {
pdisp := flag.Bool("P", false, "display only the Previous Header Hash")
ldisp := flag.Bool("L", false, "display only the Previous Full Hash")
ddisp := flag.Bool("D", false, "display only the Directory Block Height")
adisp := flag.Bool("A", false, "display only the Head Expantion Area")
adisp := flag.Bool("A", false, "display only the Head Expansion Area")
hdisp := flag.Bool("H", false, "display only the Header Hash")
fdisp := flag.Bool("F", false, "display only the Full Hash")
flag.Parse()
Expand Down
8 changes: 4 additions & 4 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import:
- base58
- package: github.com/FactomProject/cli
- package: github.com/FactomProject/factom
version: v1-rollup-testing
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not pin the glide.yaml to a branch. Let's remove this line all together

version: v1-rollup
- package: github.com/FactomProject/factomd
version: ^6.3.2
subpackages:
- util
- package: github.com/posener/complete
version: ^1.2.1
14 changes: 7 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func main() {
"unlockwallet": unlockwallet.completion,

"newtx": newtx.completion,
"rmtx": complete.Command{},
"rmtx": rmtx.completion,
"listtxs": listtxs.completion,
"addtxinput": addtxinput.completion,
"addtxoutput": addtxoutput.completion,
Expand Down Expand Up @@ -142,7 +142,7 @@ func main() {
// strings
filename := util.ConfigFilename()

//instead of giving warnings, check that the file exists before attempting
// instead of giving warnings, check that the file exists before attempting
// to read it.
if _, err := os.Stat(filename); err == nil {
cfg := util.ReadConfig(filename)
Expand Down Expand Up @@ -173,7 +173,7 @@ func main() {
}
}

//if a config file is found, and the wallet will start with TLS,
// if a config file is found, and the wallet will start with TLS,
// factom-cli should use TLS too
if cfg.Walletd.WalletTlsEnabled == true {
*walletTLSflag = true
Expand All @@ -187,7 +187,7 @@ func main() {
}
}

//if a config file is found, and the factomd will start with TLS,
// if a config file is found, and the factomd will start with TLS,
// factom-cli should use TLS too
if cfg.App.FactomdTlsEnabled == true {
*factomdTLSflag = true
Expand All @@ -202,23 +202,23 @@ func main() {
}
}

//if all defaults were specified on both the command line and config file
// if all defaults were specified on both the command line and config file
if *walletTLSCert == "" {
*walletTLSCert = fmt.Sprint(
util.GetHomeDir(),
"/.factom/walletAPIpub.cert",
)
}

//if all defaults were specified on both the command line and config file
// if all defaults were specified on both the command line and config file
if *factomdTLSCert == "" {
*factomdTLSCert = fmt.Sprint(
util.GetHomeDir(),
"/.factom/m2/factomdAPIpub.cert",
)
}

//set the default if a config file doesn't exist
// set the default if a config file doesn't exist
if *factomdLocation == "" {
*factomdLocation = "localhost:8088"
}
Expand Down