From f0e2227adacf7715ecfa7753767843ee24d35d77 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Sat, 29 Jul 2017 17:16:24 -0400 Subject: [PATCH] Use password as key, allow 3 letter names --- client/rest/types.go | 14 +++++++------- tests/cli/rest.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/rest/types.go b/client/rest/types.go index 58659f8181..fdc96ae31a 100644 --- a/client/rest/types.go +++ b/client/rest/types.go @@ -15,26 +15,26 @@ import ( ) type CreateKeyRequest struct { - Name string `json:"name,omitempty" validate:"required,min=4,printascii"` - Passphrase string `json:"passphrase,omitempty" validate:"required,min=10"` + Name string `json:"name,omitempty" validate:"required,min=3,printascii"` + Passphrase string `json:"password,omitempty" validate:"required,min=10"` // Algo is the requested algorithm to create the key Algo string `json:"algo,omitempty"` } type DeleteKeyRequest struct { - Name string `json:"name,omitempty" validate:"required,min=4,printascii"` - Passphrase string `json:"passphrase,omitempty" validate:"required,min=10"` + Name string `json:"name,omitempty" validate:"required,min=3,printascii"` + Passphrase string `json:"password,omitempty" validate:"required,min=10"` } type UpdateKeyRequest struct { - Name string `json:"name,omitempty" validate:"required,min=4,printascii"` - OldPass string `json:"passphrase,omitempty" validate:"required,min=10"` + Name string `json:"name,omitempty" validate:"required,min=3,printascii"` + OldPass string `json:"password,omitempty" validate:"required,min=10"` NewPass string `json:"new_passphrase,omitempty" validate:"required,min=10"` } type SignRequest struct { - Name string `json:"name,omitempty" validate:"required,min=4,printascii"` + Name string `json:"name,omitempty" validate:"required,min=3,printascii"` Password string `json:"password,omitempty" validate:"required,min=10"` Tx basecoin.Tx `json:"tx" validate:"required"` diff --git a/tests/cli/rest.sh b/tests/cli/rest.sh index 48a814228f..e99538845d 100755 --- a/tests/cli/rest.sh +++ b/tests/cli/rest.sh @@ -3,7 +3,7 @@ # These global variables are required for common.sh SERVER_EXE=basecoin CLIENT_EXE=basecli -ACCOUNTS=(jaekwon ethan bucky rigel igor) +ACCOUNTS=(jae ethan bucky rigel igor) RICH=${ACCOUNTS[0]} POOR=${ACCOUNTS[4]}