feat: update ethereum, build on go 1.11 (#1564)

Now the project can be built on go 1.11.
sonm-io · Oct 1, 2018 · 6f7d03d · 6f7d03d
1 parent 9af19b6
commit 6f7d03d
Show file tree

Hide file tree

Showing 1,984 changed files with 67,671 additions and 587,113 deletions.
diff --git a/connor/price/cmc_wtm_test.go b/connor/price/cmc_wtm_test.go
@@ -106,7 +106,7 @@ func TestCalculateXmrPrice(t *testing.T) {
 			expected: big.NewInt(5912092344),
 		},
 		{
-			price:    big.NewInt(params.Finney),
+			price:    big.NewInt(1e15),
 			reward:   4,
 			netHash:  563816182,
 			expected: big.NewInt(59120),

diff --git a/connor/types/corder.go b/connor/types/corder.go
@@ -76,7 +76,7 @@ func (co *Corder) GetHashrate() uint64 {
 func (co *Corder) AsBID() *sonm.BidOrder {
 	return &sonm.BidOrder{
 		Price:        &sonm.Price{PerSecond: co.Order.GetPrice()},
-		Blacklist:    sonm.NewEthAddress(common.StringToAddress(co.Order.GetBlacklist())),
+		Blacklist:    sonm.NewEthAddress(common.HexToAddress(co.Order.GetBlacklist())),
 		Identity:     co.Order.IdentityLevel,
 		Tag:          string(co.Tag),
 		Counterparty: co.CounterpartyID,

diff --git a/insonmnia/oracle/oracle.go b/insonmnia/oracle/oracle.go
@@ -157,11 +157,11 @@ func (o *Oracle) getPriceForSubmit() (*big.Int, error) {
 		return nil, fmt.Errorf("actual price is not downloaded")
 	}
 
-	if o.actualPrice.Cmp(big.NewInt(params.Finney)) < 0 {
+	if o.actualPrice.Cmp(big.NewInt(1e15)) < 0 {
 		return nil, fmt.Errorf("oracle mustn't automaticly set price lower than 1e15")
 	}
 
-	if o.actualPrice.Cmp(big.NewInt(0).Mul(big.NewInt(params.Ether), big.NewInt(params.Ada))) > 0 {
+	if o.actualPrice.Cmp(big.NewInt(0).Mul(big.NewInt(params.Ether), big.NewInt(1e3))) > 0 {
 		return nil, fmt.Errorf("oracle mustn't automaticly set price greater than 1e21")
 	}
 	return big.NewInt(0).Set(o.actualPrice), nil

diff --git a/vendor/github.com/aristanetworks/goarista/check_copyright_notice.sh b/vendor/github.com/aristanetworks/goarista/check_copyright_notice.sh
diff --git a/...tanetworks/goarista/monotime/issue15006.s → ...tanetworks/goarista/monotime/issue15006.s b/...tanetworks/goarista/monotime/issue15006.s → ...tanetworks/goarista/monotime/issue15006.s
diff --git a/...stanetworks/goarista/monotime/nanotime.go → ...stanetworks/goarista/monotime/nanotime.go b/...stanetworks/goarista/monotime/nanotime.go → ...stanetworks/goarista/monotime/nanotime.go
diff --git a/vendor/github.com/deckarep/golang-set/LICENSE b/vendor/github.com/deckarep/golang-set/LICENSE
diff --git a/vendor/github.com/deckarep/golang-set/README.md b/vendor/github.com/deckarep/golang-set/README.md
diff --git a/vendor/github.com/deckarep/golang-set/iterator.go b/vendor/github.com/deckarep/golang-set/iterator.go