Merge pull request #172 from gz-c/update-skycoin

Update skycoin
skycoin · Dec 14, 2017 · a050896 · a050896
2 parents 41d9cc8 + 48d3c95
commit a050896
Show file tree

Hide file tree

Showing 114 changed files with 7,713 additions and 3,310 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -47,7 +47,7 @@
 
 [[constraint]]
   name = "github.com/skycoin/skycoin"
-  version = "v0.20.4"
+  version = "v0.21.0"
 
 [[constraint]]
   name = "github.com/stretchr/testify"

diff --git a/src/config/config.go b/src/config/config.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/skycoin/skycoin/src/daemon"
+	"github.com/skycoin/skycoin/src/visor"
 	"github.com/skycoin/skycoin/src/wallet"
 	"github.com/skycoin/teller/src/util/mathutil"
 )
@@ -235,8 +235,8 @@ func (c Config) Validate() error {
 		oops("sky_exchanger.max_decimals can't be negative")
 	}
 
-	if c.SkyExchanger.MaxDecimals > daemon.MaxDropletPrecision {
-		oops(fmt.Sprintf("sky_exchanger.max_decimals is larger than daemon.MaxDropletPrecision=%d", daemon.MaxDropletPrecision))
+	if uint64(c.SkyExchanger.MaxDecimals) > visor.MaxDropletPrecision {
+		oops(fmt.Sprintf("sky_exchanger.max_decimals is larger than visor.MaxDropletPrecision=%d", visor.MaxDropletPrecision))
 	}
 
 	if err := c.Web.Validate(); err != nil {

diff --git a/src/exchange/exchange.go b/src/exchange/exchange.go
@@ -12,8 +12,8 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/skycoin/skycoin/src/coin"
-	"github.com/skycoin/skycoin/src/daemon"
 	"github.com/skycoin/skycoin/src/util/droplet"
+	"github.com/skycoin/skycoin/src/visor"
 
 	"github.com/skycoin/teller/src/scanner"
 	"github.com/skycoin/teller/src/sender"
@@ -80,8 +80,8 @@ func (c Config) Validate() error {
 		return errors.New("MaxDecimals can't be negative")
 	}
 
-	if c.MaxDecimals > daemon.MaxDropletPrecision {
-		return fmt.Errorf("MaxDecimals is larger than daemon.MaxDropletPrecision=%d", daemon.MaxDropletPrecision)
+	if uint64(c.MaxDecimals) > visor.MaxDropletPrecision {
+		return fmt.Errorf("MaxDecimals is larger than visor.MaxDropletPrecision=%d", visor.MaxDropletPrecision)
 	}
 
 	return nil

diff --git a/vendor/github.com/cenkalti/backoff/.gitignore b/vendor/github.com/cenkalti/backoff/.gitignore
diff --git a/vendor/github.com/cenkalti/backoff/.travis.yml b/vendor/github.com/cenkalti/backoff/.travis.yml
diff --git a/vendor/github.com/cenkalti/backoff/LICENSE b/vendor/github.com/cenkalti/backoff/LICENSE
diff --git a/vendor/github.com/cenkalti/backoff/README.md b/vendor/github.com/cenkalti/backoff/README.md
diff --git a/vendor/github.com/cenkalti/backoff/backoff.go b/vendor/github.com/cenkalti/backoff/backoff.go
diff --git a/vendor/github.com/cenkalti/backoff/backoff_test.go b/vendor/github.com/cenkalti/backoff/backoff_test.go
diff --git a/vendor/github.com/cenkalti/backoff/context.go b/vendor/github.com/cenkalti/backoff/context.go
diff --git a/vendor/github.com/cenkalti/backoff/context_test.go b/vendor/github.com/cenkalti/backoff/context_test.go