Skip to content

Commit a050896

Browse files
authored
Merge pull request #172 from gz-c/update-skycoin
Update skycoin
2 parents 41d9cc8 + 48d3c95 commit a050896

File tree

114 files changed

+7713
-3310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+7713
-3310
lines changed

Gopkg.lock

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
[[constraint]]
4949
name = "github.com/skycoin/skycoin"
50-
version = "v0.20.4"
50+
version = "v0.21.0"
5151

5252
[[constraint]]
5353
name = "github.com/stretchr/testify"

src/config/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/spf13/viper"
1313

14-
"github.com/skycoin/skycoin/src/daemon"
14+
"github.com/skycoin/skycoin/src/visor"
1515
"github.com/skycoin/skycoin/src/wallet"
1616
"github.com/skycoin/teller/src/util/mathutil"
1717
)
@@ -235,8 +235,8 @@ func (c Config) Validate() error {
235235
oops("sky_exchanger.max_decimals can't be negative")
236236
}
237237

238-
if c.SkyExchanger.MaxDecimals > daemon.MaxDropletPrecision {
239-
oops(fmt.Sprintf("sky_exchanger.max_decimals is larger than daemon.MaxDropletPrecision=%d", daemon.MaxDropletPrecision))
238+
if uint64(c.SkyExchanger.MaxDecimals) > visor.MaxDropletPrecision {
239+
oops(fmt.Sprintf("sky_exchanger.max_decimals is larger than visor.MaxDropletPrecision=%d", visor.MaxDropletPrecision))
240240
}
241241

242242
if err := c.Web.Validate(); err != nil {

src/exchange/exchange.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/sirupsen/logrus"
1313

1414
"github.com/skycoin/skycoin/src/coin"
15-
"github.com/skycoin/skycoin/src/daemon"
1615
"github.com/skycoin/skycoin/src/util/droplet"
16+
"github.com/skycoin/skycoin/src/visor"
1717

1818
"github.com/skycoin/teller/src/scanner"
1919
"github.com/skycoin/teller/src/sender"
@@ -80,8 +80,8 @@ func (c Config) Validate() error {
8080
return errors.New("MaxDecimals can't be negative")
8181
}
8282

83-
if c.MaxDecimals > daemon.MaxDropletPrecision {
84-
return fmt.Errorf("MaxDecimals is larger than daemon.MaxDropletPrecision=%d", daemon.MaxDropletPrecision)
83+
if uint64(c.MaxDecimals) > visor.MaxDropletPrecision {
84+
return fmt.Errorf("MaxDecimals is larger than visor.MaxDropletPrecision=%d", visor.MaxDropletPrecision)
8585
}
8686

8787
return nil

vendor/github.com/cenkalti/backoff/.gitignore

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cenkalti/backoff/.travis.yml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cenkalti/backoff/LICENSE

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cenkalti/backoff/README.md

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cenkalti/backoff/backoff.go

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cenkalti/backoff/backoff_test.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)