Merge pull request #1786 from Roasbeef/golang-1.1

build+docs: bump to golang 1.11
This commit is contained in:
Olaoluwa Osuntokun 2018-10-08 13:26:07 +09:00 committed by GitHub
commit 3fda1029c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 40 additions and 28 deletions

@ -1,17 +1,20 @@
language: go language: go
go: matrix:
- "1.9.4" include:
- "1.10" - go: "1.11"
env: RACE=FALSE USE_LINT=TRUE
- go: "1.11"
env: RACE=FALSE USE_LINT=TRUE
- go: "1.10"
env: RACE=TRUE USE_LINT=FALSE
- go: "1.10"
env: RACE=FALSE USE_LINT=FALSE
sudo: required sudo: required
install: install:
- sudo add-apt-repository -y ppa:bitcoin/bitcoin -y - sudo add-apt-repository -y ppa:bitcoin/bitcoin -y
- sudo apt-get update -q - sudo apt-get update -q
- sudo apt-get install bitcoind -y - sudo apt-get install bitcoind -y
- export PATH=$PATH:$PWD/linux-amd64/ - export PATH=$PATH:$PWD/linux-amd64/
env:
matrix:
- RACE=false
- RACE=true
script: script:
- export PATH=$PATH:$GOPATH/bin - export PATH=$PATH:$GOPATH/bin
- make travis - make travis

@ -185,16 +185,25 @@ flake-unit:
# TRAVIS # TRAVIS
# ====== # ======
ifeq ($(RACE), false) ifeq ($(RACE)$(USE_LINT), FALSETRUE)
travis: dep lint build itest unit-cover $(GOVERALLS_BIN) travis: dep lint build itest unit-cover $(GOVERALLS_BIN)
@$(call print, "Sending coverage report.") @$(call print, "Sending coverage report.")
$(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci $(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci
endif endif
ifeq ($(RACE), true) ifeq ($(RACE)$(USE_LINT), FALSEFALSE)
travis: dep build itest unit-cover $(GOVERALLS_BIN)
@$(call print, "Sending coverage report.")
$(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci
endif
ifeq ($(RACE)$(USE_LINT), TRUETRUE)
travis: dep lint btcd unit-race travis: dep lint btcd unit-race
endif endif
ifeq ($(RACE)$(USE_LINT), TRUEFALSE)
travis: dep btcd unit-race
endif
# ========= # =========
# UTILITIES # UTILITIES

@ -229,7 +229,7 @@ func (d *databaseChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
MinHTLC: 1, MinHTLC: 1,
FeeBaseMSat: 10, FeeBaseMSat: 10,
FeeProportionalMillionths: 10000, FeeProportionalMillionths: 10000,
Flags: 0, Flags: 0,
} }
if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil { if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil {
@ -243,7 +243,7 @@ func (d *databaseChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
MinHTLC: 1, MinHTLC: 1,
FeeBaseMSat: 10, FeeBaseMSat: 10,
FeeProportionalMillionths: 10000, FeeProportionalMillionths: 10000,
Flags: 1, Flags: 1,
} }
if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil { if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil {
return nil, nil, err return nil, nil, err

@ -704,9 +704,9 @@ func TestEdgeInfoUpdates(t *testing.T) {
MinHTLC: 2342135, MinHTLC: 2342135,
FeeBaseMSat: 4352345, FeeBaseMSat: 4352345,
FeeProportionalMillionths: 3452352, FeeProportionalMillionths: 3452352,
Node: secondNode, Node: secondNode,
ExtraOpaqueData: []byte("new unknown feature2"), ExtraOpaqueData: []byte("new unknown feature2"),
db: db, db: db,
} }
edge2 := &ChannelEdgePolicy{ edge2 := &ChannelEdgePolicy{
SigBytes: testSig.Serialize(), SigBytes: testSig.Serialize(),
@ -717,9 +717,9 @@ func TestEdgeInfoUpdates(t *testing.T) {
MinHTLC: 2342135, MinHTLC: 2342135,
FeeBaseMSat: 4352345, FeeBaseMSat: 4352345,
FeeProportionalMillionths: 90392423, FeeProportionalMillionths: 90392423,
Node: firstNode, Node: firstNode,
ExtraOpaqueData: []byte("new unknown feature1"), ExtraOpaqueData: []byte("new unknown feature1"),
db: db, db: db,
} }
// Next, insert both nodes into the database, they should both be // Next, insert both nodes into the database, they should both be
@ -796,7 +796,7 @@ func newEdgePolicy(chanID uint64, op wire.OutPoint, db *DB,
MinHTLC: lnwire.MilliSatoshi(prand.Int63()), MinHTLC: lnwire.MilliSatoshi(prand.Int63()),
FeeBaseMSat: lnwire.MilliSatoshi(prand.Int63()), FeeBaseMSat: lnwire.MilliSatoshi(prand.Int63()),
FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int63()), FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int63()),
db: db, db: db,
} }
} }

@ -7,14 +7,14 @@
* **Go:** `lnd` is written in Go. To install, run one of the following commands: * **Go:** `lnd` is written in Go. To install, run one of the following commands:
**Note**: The minimum version of Go supported is Go 1.9. We recommend that **Note**: The minimum version of Go supported is Go 1.10. We recommend that
users use the latest version of Go, which at the time of writing is users use the latest version of Go, which at the time of writing is
[`1.10`](https://blog.golang.org/go1.10). [`1.11`](https://blog.golang.org/go1.11).
On Linux: On Linux:
``` ```
sudo apt-get install golang-1.10-go sudo apt-get install golang-1.11-go
``` ```
> Note that golang-1.10-go puts binaries in /usr/lib/go-1.10/bin. If you want them on your PATH, you need to make that change yourself. Alternatively, you can run: > Note that golang-1.10-go puts binaries in /usr/lib/go-1.10/bin. If you want them on your PATH, you need to make that change yourself. Alternatively, you can run:
``` ```

@ -101,7 +101,7 @@ func newCircuitMap(t *testing.T) (*htlcswitch.CircuitMapConfig,
onionProcessor := newOnionProcessor(t) onionProcessor := newOnionProcessor(t)
circuitMapCfg := &htlcswitch.CircuitMapConfig{ circuitMapCfg := &htlcswitch.CircuitMapConfig{
DB: makeCircuitDB(t, ""), DB: makeCircuitDB(t, ""),
ExtractErrorEncrypter: onionProcessor.ExtractErrorEncrypter, ExtractErrorEncrypter: onionProcessor.ExtractErrorEncrypter,
} }
@ -660,7 +660,7 @@ func restartCircuitMap(t *testing.T, cfg *htlcswitch.CircuitMapConfig) (
// Reinitialize circuit map with same db path. // Reinitialize circuit map with same db path.
cfg2 := &htlcswitch.CircuitMapConfig{ cfg2 := &htlcswitch.CircuitMapConfig{
DB: makeCircuitDB(t, dbPath), DB: makeCircuitDB(t, dbPath),
ExtractErrorEncrypter: cfg.ExtractErrorEncrypter, ExtractErrorEncrypter: cfg.ExtractErrorEncrypter,
} }
cm2, err := htlcswitch.NewCircuitMap(cfg2) cm2, err := htlcswitch.NewCircuitMap(cfg2)

@ -53,7 +53,7 @@ func (c *concurrentTester) Fatalf(format string, args ...interface{}) {
c.mtx.Lock() c.mtx.Lock()
defer c.mtx.Unlock() defer c.mtx.Unlock()
c.T.Fatalf(format, args) c.T.Fatalf(format, args...)
} }
// messageToString is used to produce less spammy log messages in trace mode by // messageToString is used to produce less spammy log messages in trace mode by

@ -282,7 +282,7 @@ type Switch struct {
// New creates the new instance of htlc switch. // New creates the new instance of htlc switch.
func New(cfg Config, currentHeight uint32) (*Switch, error) { func New(cfg Config, currentHeight uint32) (*Switch, error) {
circuitMap, err := NewCircuitMap(&CircuitMapConfig{ circuitMap, err := NewCircuitMap(&CircuitMapConfig{
DB: cfg.DB, DB: cfg.DB,
ExtractErrorEncrypter: cfg.ExtractErrorEncrypter, ExtractErrorEncrypter: cfg.ExtractErrorEncrypter,
}) })
if err != nil { if err != nil {

2
lnd.go

@ -558,7 +558,7 @@ func genCertPair(certFile, keyFile string) error {
KeyUsage: x509.KeyUsageKeyEncipherment | KeyUsage: x509.KeyUsageKeyEncipherment |
x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
IsCA: true, // so can sign self. IsCA: true, // so can sign self.
BasicConstraintsValid: true, BasicConstraintsValid: true,
DNSNames: dnsNames, DNSNames: dnsNames,

@ -78,7 +78,7 @@ func randEdgePolicy(chanID *lnwire.ShortChannelID,
MinHTLC: lnwire.MilliSatoshi(prand.Int31()), MinHTLC: lnwire.MilliSatoshi(prand.Int31()),
FeeBaseMSat: lnwire.MilliSatoshi(prand.Int31()), FeeBaseMSat: lnwire.MilliSatoshi(prand.Int31()),
FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int31()), FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int31()),
Node: node, Node: node,
} }
} }

@ -973,7 +973,7 @@ func TestNewRoute(t *testing.T) {
return &ChannelHop{ return &ChannelHop{
ChannelEdgePolicy: &channeldb.ChannelEdgePolicy{ ChannelEdgePolicy: &channeldb.ChannelEdgePolicy{
Node: &channeldb.LightningNode{}, Node: &channeldb.LightningNode{},
FeeProportionalMillionths: feeRate, FeeProportionalMillionths: feeRate,
FeeBaseMSat: baseFee, FeeBaseMSat: baseFee,
TimeLockDelta: timeLockDelta, TimeLockDelta: timeLockDelta,