improve input reader

.travis.yml

@@ -15,6 +15,7 @@ before_install:
 
 install:
   - if [[ ! -d $GOPATH/src/github.com/fibercrypto/skywallet-go ]]; then mkdir -p $GOPATH/src/github.com/skycoin; ln -s $TRAVIS_BUILD_DIR $GOPATH/src/github.com/fibercrypto/skywallet-go; fi
+  - go get -d github.com/fibercrypto/fibercryptowallet
   - go get github.com/vektra/mockery/.../
   - cd $GOPATH/src/github.com/fibercrypto/skywallet-go
   - make mocks

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Change `protobuf` file definitions from http://github.com/skycoin/hardware-wallet-protob.git to http://github.com/fibercrypto/skywallet-go.git
+- Be able to set the emulator ip as argument.
 
 ### Removed
 

Gopkg.toml

@@ -40,3 +40,7 @@
 [[constraint]]
   branch = "develop"
   name = "github.com/fibercrypto/skywallet-protob"
+
+[[constraint]]
+  name = "github.com/russross/blackfriday"
+  version = "1.5.2"

src/cli/firmware_update.go

@@ -3,6 +3,8 @@ package cli
 import (
 	"crypto/sha256"
 	"fmt"
+	"github.com/fibercrypto/skywallet-go/src/skywallet"
+	messages "github.com/fibercrypto/skywallet-protob/go"
 	"io/ioutil"
 
 	gcli "github.com/urfave/cli"
@@ -29,11 +31,12 @@ func firmwareUpdate() gcli.Command {
 				panic(err)
 			}
 			fmt.Printf("Hash: %x\n", sha256.Sum256(firmware[0x100:]))
-			sq, err := createDevice(c.String("deviceType"))
+			sq, err := createDevice(skywallet.DeviceTypeUSB.String())
 			if err != nil {
 				return
 			}
-			err = sq.FirmwareUpload(firmware, sha256.Sum256(firmware[0x100:]))
+			msg, err := sq.UploadFirmware(firmware, sha256.Sum256(firmware[0x100:]))
+			handleFinalResponse(msg, err, "unable to update firmware", messages.MessageType_MessageType_Success)
 			if err != nil {
 				log.Error(err)
 				return

src/cli/integration/integration_test.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
@@ -532,7 +533,10 @@ func TestRecovery(t *testing.T) {
 	var fail = false
 	var stdInDone = false
 
+	wg := sync.WaitGroup{}
+	wg.Add(2)
 	go func() {
+		defer wg.Done()
 		scanner := bufio.NewScanner(stdoutPipe)
 
 		scanner.Split(bufio.ScanWords)
@@ -545,7 +549,7 @@ func TestRecovery(t *testing.T) {
 
 				stdInDone = true
 			} else if stdInDone {
-				if m == "Wrong" || m == "Word" {
+				if m == "Wrong" || m == "word" {
 					fail = true
 					break
 				}
@@ -554,14 +558,19 @@ func TestRecovery(t *testing.T) {
 	}()
 
 	go func() {
+		defer wg.Done()
 		scanner := bufio.NewScanner(stderrPipe)
 		scanner.Split(bufio.ScanWords)
 		for scanner.Scan() {
-			log.Errorln(scanner.Text())
+			m := scanner.Text()
+			if m == "Wrong" || m == "word" || m == `error="Word` {
+				fail = true
+				break
+			}
 		}
 	}()
-
 	err = cmd.Wait()
+	wg.Wait()
 	require.NoError(t, err)
 	require.True(t, fail)
 }

src/cli/utils.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/fibercrypto/fibercryptowallet/src/util/logging"
 	"github.com/sirupsen/logrus"
 	"github.com/fibercrypto/skywallet-go/src/integration/proxy"
 	"github.com/fibercrypto/skywallet-go/src/skywallet"
@@ -41,10 +42,19 @@ func createDevice(devType string) (skywallet.Devicer, error) {
 			return nil, err
 		}
 	}
-	return proxy.NewSequencer(device, false, func() string{
-		var line string
-		fmt.Scanln(&line)
-		return line
+	return proxy.NewSequencer(device, false, func(kind skywallet.InputRequestKind, title, message string) (string, error) {
+		if kind != skywallet.RequestInformUserOnlyOk && kind != skywallet.RequestInformUserOnlyCancel && kind != skywallet.RequestInformUserOkAndCancel {
+			var line string
+			if kind == skywallet.RequestKindWord {
+				logging.NewMasterLogger().Printf("Word:")
+				fmt.Scan(&line)
+			} else {
+				logging.NewMasterLogger().Printf(title)
+				fmt.Scanln(&line)
+			}
+			return line, nil
+		}
+		return "", nil
 	}), nil
 }