highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-19 21:31:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

multi: run go fmt with go 1.17

Browse Source
This commit is contained in:
Oliver Gugger 2021-11-08 12:00:58 +01:00
parent 602d2065eb
commit 41c579fd09
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
11 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kvdb/kvdb_no_postgres.go
View File

@ -1,3 +1,4 @@
//go:build !kvdb_postgres
// +build !kvdb_postgres // +build !kvdb_postgres
package kvdb package kvdb

1
kvdb/kvdb_postgres.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package kvdb package kvdb

1
kvdb/postgres/db.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

1
kvdb/postgres/db_test.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

1
kvdb/postgres/driver.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

1
kvdb/postgres/fixture.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

1
kvdb/postgres/readwrite_bucket.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

1
kvdb/postgres/readwrite_cursor.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

1
kvdb/postgres/readwrite_tx.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package postgres package postgres

83
kvdb/postgres_test.go
View File

@ -1,3 +1,4 @@
//go:build kvdb_postgres
// +build kvdb_postgres // +build kvdb_postgres
package kvdb package kvdb
@ -35,13 +36,13 @@ func TestPostgres(t *testing.T) {
test: testReadWriteCursor, test: testReadWriteCursor,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(4), "key": "da", "parent_id": int64(1), "sequence": nil, "value": "3"}, {"id": int64(4), "key": "da", "parent_id": int64(1), "sequence": nil, "value": "3"},
m{"id": int64(6), "key": "a", "parent_id": int64(1), "sequence": nil, "value": "0"}, {"id": int64(6), "key": "a", "parent_id": int64(1), "sequence": nil, "value": "0"},
m{"id": int64(7), "key": "f", "parent_id": int64(1), "sequence": nil, "value": "5"}, {"id": int64(7), "key": "f", "parent_id": int64(1), "sequence": nil, "value": "5"},
m{"id": int64(3), "key": "c", "parent_id": int64(1), "sequence": nil, "value": "3"}, {"id": int64(3), "key": "c", "parent_id": int64(1), "sequence": nil, "value": "3"},
m{"id": int64(9), "key": "cx", "parent_id": int64(1), "sequence": nil, "value": "x"}, {"id": int64(9), "key": "cx", "parent_id": int64(1), "sequence": nil, "value": "x"},
m{"id": int64(10), "key": "cy", "parent_id": int64(1), "sequence": nil, "value": "y"}, {"id": int64(10), "key": "cy", "parent_id": int64(1), "sequence": nil, "value": "y"},
}, },
}, },
}, },
@ -50,10 +51,10 @@ func TestPostgres(t *testing.T) {
test: testReadWriteCursorWithBucketAndValue, test: testReadWriteCursorWithBucketAndValue,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "key", "parent_id": int64(1), "sequence": nil, "value": "val"}, {"id": int64(2), "key": "key", "parent_id": int64(1), "sequence": nil, "value": "val"},
m{"id": int64(3), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(3), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(4), "key": "pear", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(4), "key": "pear", "parent_id": int64(1), "sequence": nil, "value": nil},
}, },
}, },
}, },
@ -62,10 +63,10 @@ func TestPostgres(t *testing.T) {
test: testBucketCreation, test: testBucketCreation,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(3), "key": "mango", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(3), "key": "mango", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(4), "key": "pear", "parent_id": int64(2), "sequence": nil, "value": nil}, {"id": int64(4), "key": "pear", "parent_id": int64(2), "sequence": nil, "value": nil},
}, },
}, },
}, },
@ -74,10 +75,10 @@ func TestPostgres(t *testing.T) {
test: testBucketDeletion, test: testBucketDeletion,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(3), "key": "key1", "parent_id": int64(2), "sequence": nil, "value": "val1"}, {"id": int64(3), "key": "key1", "parent_id": int64(2), "sequence": nil, "value": "val1"},
m{"id": int64(5), "key": "key3", "parent_id": int64(2), "sequence": nil, "value": "val3"}, {"id": int64(5), "key": "key3", "parent_id": int64(2), "sequence": nil, "value": "val3"},
}, },
}, },
}, },
@ -86,14 +87,14 @@ func TestPostgres(t *testing.T) {
test: testBucketForEach, test: testBucketForEach,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(3), "key": "key1", "parent_id": int64(1), "sequence": nil, "value": "val1"}, {"id": int64(3), "key": "key1", "parent_id": int64(1), "sequence": nil, "value": "val1"},
m{"id": int64(4), "key": "key1", "parent_id": int64(2), "sequence": nil, "value": "val1"}, {"id": int64(4), "key": "key1", "parent_id": int64(2), "sequence": nil, "value": "val1"},
m{"id": int64(5), "key": "key2", "parent_id": int64(1), "sequence": nil, "value": "val2"}, {"id": int64(5), "key": "key2", "parent_id": int64(1), "sequence": nil, "value": "val2"},
m{"id": int64(6), "key": "key2", "parent_id": int64(2), "sequence": nil, "value": "val2"}, {"id": int64(6), "key": "key2", "parent_id": int64(2), "sequence": nil, "value": "val2"},
m{"id": int64(7), "key": "key3", "parent_id": int64(1), "sequence": nil, "value": "val3"}, {"id": int64(7), "key": "key3", "parent_id": int64(1), "sequence": nil, "value": "val3"},
m{"id": int64(8), "key": "key3", "parent_id": int64(2), "sequence": nil, "value": "val3"}, {"id": int64(8), "key": "key3", "parent_id": int64(2), "sequence": nil, "value": "val3"},
}, },
}, },
}, },
@ -102,11 +103,11 @@ func TestPostgres(t *testing.T) {
test: testBucketForEachWithError, test: testBucketForEachWithError,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(3), "key": "pear", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(3), "key": "pear", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(4), "key": "key1", "parent_id": int64(1), "sequence": nil, "value": "val1"}, {"id": int64(4), "key": "key1", "parent_id": int64(1), "sequence": nil, "value": "val1"},
m{"id": int64(5), "key": "key2", "parent_id": int64(1), "sequence": nil, "value": "val2"}, {"id": int64(5), "key": "key2", "parent_id": int64(1), "sequence": nil, "value": "val2"},
}, },
}, },
}, },
@ -115,8 +116,8 @@ func TestPostgres(t *testing.T) {
test: testBucketSequence, test: testBucketSequence,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(2), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": int64(4), "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": int64(4), "value": nil},
}, },
}, },
}, },
@ -125,9 +126,9 @@ func TestPostgres(t *testing.T) {
test: testKeyClash, test: testKeyClash,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "key", "parent_id": int64(1), "sequence": nil, "value": "val"}, {"id": int64(2), "key": "key", "parent_id": int64(1), "sequence": nil, "value": "val"},
m{"id": int64(3), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil}, {"id": int64(3), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": nil},
}, },
}, },
}, },
@ -136,8 +137,8 @@ func TestPostgres(t *testing.T) {
test: testBucketCreateDelete, test: testBucketCreateDelete,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(3), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": "value"}, {"id": int64(3), "key": "banana", "parent_id": int64(1), "sequence": nil, "value": "value"},
}, },
}, },
}, },
@ -146,8 +147,8 @@ func TestPostgres(t *testing.T) {
test: testTxManualCommit, test: testTxManualCommit,
expectedDb: m{ expectedDb: m{
"test_kv": []m{ "test_kv": []m{
m{"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil}, {"id": int64(1), "key": "apple", "parent_id": nil, "sequence": nil, "value": nil},
m{"id": int64(2), "key": "testKey", "parent_id": int64(1), "sequence": nil, "value": "testVal"}, {"id": int64(2), "key": "testKey", "parent_id": int64(1), "sequence": nil, "value": "testVal"},
}, },
}, },
}, },

1
macaroons/service.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/kvdb"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"gopkg.in/macaroon-bakery.v2/bakery" "gopkg.in/macaroon-bakery.v2/bakery"