From d8e6085c1749a5b8a75a16b82fe2e49c3bf24c92 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sun, 7 Oct 2018 11:34:32 +0900 Subject: [PATCH] multi: update to go 1.11 gofmt --- autopilot/graph.go | 4 ++-- channeldb/graph_test.go | 14 +++++++------- htlcswitch/circuit_test.go | 4 ++-- htlcswitch/switch.go | 2 +- lnd.go | 2 +- routing/notifications_test.go | 2 +- routing/pathfind_test.go | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/autopilot/graph.go b/autopilot/graph.go index 9834c8b4..17e771bf 100644 --- a/autopilot/graph.go +++ b/autopilot/graph.go @@ -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 { @@ -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 diff --git a/channeldb/graph_test.go b/channeldb/graph_test.go index eb6db864..92fcd4f1 100644 --- a/channeldb/graph_test.go +++ b/channeldb/graph_test.go @@ -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(), @@ -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 @@ -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, } } diff --git a/htlcswitch/circuit_test.go b/htlcswitch/circuit_test.go index b693ebe7..7743768d 100644 --- a/htlcswitch/circuit_test.go +++ b/htlcswitch/circuit_test.go @@ -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, } @@ -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) diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go index 66283d8b..7c12f621 100644 --- a/htlcswitch/switch.go +++ b/htlcswitch/switch.go @@ -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 { diff --git a/lnd.go b/lnd.go index e323e95d..fe2ffc8c 100644 --- a/lnd.go +++ b/lnd.go @@ -564,7 +564,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, diff --git a/routing/notifications_test.go b/routing/notifications_test.go index 2fa12274..8214050f 100644 --- a/routing/notifications_test.go +++ b/routing/notifications_test.go @@ -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, } } diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go index a014bfb2..fb0ab984 100644 --- a/routing/pathfind_test.go +++ b/routing/pathfind_test.go @@ -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,