Skip to content

Commit

Permalink
Merge pull request #1786 from Roasbeef/golang-1.1
Browse files Browse the repository at this point in the history
build+docs: bump to golang 1.11
  • Loading branch information
Roasbeef committed Oct 8, 2018
2 parents 8dfcbc1 + f07260a commit 3fda102
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 28 deletions.
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
language: go
go:
- "1.9.4"
- "1.10"
matrix:
include:
- 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
install:
- sudo add-apt-repository -y ppa:bitcoin/bitcoin -y
- sudo apt-get update -q
- sudo apt-get install bitcoind -y
- export PATH=$PATH:$PWD/linux-amd64/
env:
matrix:
- RACE=false
- RACE=true
script:
- export PATH=$PATH:$GOPATH/bin
- make travis
Expand Down
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,25 @@ flake-unit:
# TRAVIS
# ======

ifeq ($(RACE), false)
ifeq ($(RACE)$(USE_LINT), FALSETRUE)
travis: dep lint build itest unit-cover $(GOVERALLS_BIN)
@$(call print, "Sending coverage report.")
$(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci
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
endif

ifeq ($(RACE)$(USE_LINT), TRUEFALSE)
travis: dep btcd unit-race
endif

# =========
# UTILITIES
Expand Down
4 changes: 2 additions & 2 deletions autopilot/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func (d *databaseChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
MinHTLC: 1,
FeeBaseMSat: 10,
FeeProportionalMillionths: 10000,
Flags: 0,
Flags: 0,
}

if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil {
Expand All @@ -243,7 +243,7 @@ func (d *databaseChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
MinHTLC: 1,
FeeBaseMSat: 10,
FeeProportionalMillionths: 10000,
Flags: 1,
Flags: 1,
}
if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil {
return nil, nil, err
Expand Down
14 changes: 7 additions & 7 deletions channeldb/graph_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -704,9 +704,9 @@ func TestEdgeInfoUpdates(t *testing.T) {
MinHTLC: 2342135,
FeeBaseMSat: 4352345,
FeeProportionalMillionths: 3452352,
Node: secondNode,
ExtraOpaqueData: []byte("new unknown feature2"),
db: db,
Node: secondNode,
ExtraOpaqueData: []byte("new unknown feature2"),
db: db,
}
edge2 := &ChannelEdgePolicy{
SigBytes: testSig.Serialize(),
Expand All @@ -717,9 +717,9 @@ func TestEdgeInfoUpdates(t *testing.T) {
MinHTLC: 2342135,
FeeBaseMSat: 4352345,
FeeProportionalMillionths: 90392423,
Node: firstNode,
ExtraOpaqueData: []byte("new unknown feature1"),
db: db,
Node: firstNode,
ExtraOpaqueData: []byte("new unknown feature1"),
db: db,
}

// Next, insert both nodes into the database, they should both be
Expand Down Expand Up @@ -796,7 +796,7 @@ func newEdgePolicy(chanID uint64, op wire.OutPoint, db *DB,
MinHTLC: lnwire.MilliSatoshi(prand.Int63()),
FeeBaseMSat: lnwire.MilliSatoshi(prand.Int63()),
FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int63()),
db: db,
db: db,
}
}

Expand Down
6 changes: 3 additions & 3 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
* **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
[`1.10`](https://blog.golang.org/go1.10).
[`1.11`](https://blog.golang.org/go1.11).


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:
```
Expand Down
4 changes: 2 additions & 2 deletions htlcswitch/circuit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func newCircuitMap(t *testing.T) (*htlcswitch.CircuitMapConfig,
onionProcessor := newOnionProcessor(t)

circuitMapCfg := &htlcswitch.CircuitMapConfig{
DB: makeCircuitDB(t, ""),
DB: makeCircuitDB(t, ""),
ExtractErrorEncrypter: onionProcessor.ExtractErrorEncrypter,
}

Expand Down Expand Up @@ -660,7 +660,7 @@ func restartCircuitMap(t *testing.T, cfg *htlcswitch.CircuitMapConfig) (

// Reinitialize circuit map with same db path.
cfg2 := &htlcswitch.CircuitMapConfig{
DB: makeCircuitDB(t, dbPath),
DB: makeCircuitDB(t, dbPath),
ExtractErrorEncrypter: cfg.ExtractErrorEncrypter,
}
cm2, err := htlcswitch.NewCircuitMap(cfg2)
Expand Down
2 changes: 1 addition & 1 deletion htlcswitch/link_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (c *concurrentTester) Fatalf(format string, args ...interface{}) {
c.mtx.Lock()
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
Expand Down
2 changes: 1 addition & 1 deletion htlcswitch/switch.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ type Switch struct {
// New creates the new instance of htlc switch.
func New(cfg Config, currentHeight uint32) (*Switch, error) {
circuitMap, err := NewCircuitMap(&CircuitMapConfig{
DB: cfg.DB,
DB: cfg.DB,
ExtractErrorEncrypter: cfg.ExtractErrorEncrypter,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lnd.go
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ func genCertPair(certFile, keyFile string) error {

KeyUsage: x509.KeyUsageKeyEncipherment |
x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
IsCA: true, // so can sign self.
IsCA: true, // so can sign self.
BasicConstraintsValid: true,

DNSNames: dnsNames,
Expand Down
2 changes: 1 addition & 1 deletion routing/notifications_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func randEdgePolicy(chanID *lnwire.ShortChannelID,
MinHTLC: lnwire.MilliSatoshi(prand.Int31()),
FeeBaseMSat: lnwire.MilliSatoshi(prand.Int31()),
FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int31()),
Node: node,
Node: node,
}
}

Expand Down
2 changes: 1 addition & 1 deletion routing/pathfind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ func TestNewRoute(t *testing.T) {

return &ChannelHop{
ChannelEdgePolicy: &channeldb.ChannelEdgePolicy{
Node: &channeldb.LightningNode{},
Node: &channeldb.LightningNode{},
FeeProportionalMillionths: feeRate,
FeeBaseMSat: baseFee,
TimeLockDelta: timeLockDelta,
Expand Down

0 comments on commit 3fda102

Please sign in to comment.