From 7aa9661d42f79e3b9aeb85d67e70b75c577750bb Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Wed, 29 Sep 2021 10:12:25 +0200 Subject: [PATCH 1/7] lntest: use errgroup for node startup This commit fixes a nil pointer issue when a node fails to start up. Because require.NoErrorf() doesn't abort a test immediately if run inside a goroutine, this lead to the test continuing with nil node references which lead to a panic later on. --- lntest/harness.go | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/lntest/harness.go b/lntest/harness.go index 1b03a4ef6..485a2b9af 100644 --- a/lntest/harness.go +++ b/lntest/harness.go @@ -28,6 +28,7 @@ import ( "github.com/lightningnetwork/lnd/lnwallet/chainfee" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" + "golang.org/x/sync/errgroup" "google.golang.org/grpc/grpclog" ) @@ -163,17 +164,22 @@ func (n *NetworkHarness) SetUp(t *testing.T, // Start the initial seeder nodes within the test network, then connect // their respective RPC clients. - var wg sync.WaitGroup - wg.Add(2) - go func() { - defer wg.Done() - n.Alice = n.NewNode(t, "Alice", lndArgs) - }() - go func() { - defer wg.Done() - n.Bob = n.NewNode(t, "Bob", lndArgs) - }() - wg.Wait() + eg := errgroup.Group{} + eg.Go(func() error { + var err error + n.Alice, err = n.newNode( + "Alice", lndArgs, false, nil, n.dbBackend, true, + ) + return err + }) + eg.Go(func() error { + var err error + n.Bob, err = n.newNode( + "Bob", lndArgs, false, nil, n.dbBackend, true, + ) + return err + }) + require.NoError(t, eg.Wait()) // First, make a connection between the two nodes. This will wait until // both nodes are fully started since the Connect RPC is guarded behind From d973cf1060afc51540f27bcb2a739c7ed5e88691 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sun, 22 Aug 2021 14:46:47 -0500 Subject: [PATCH 2/7] build: upgrade all CI+build infra to Go 1.17 --- .github/workflows/main.yml | 2 +- .github/workflows/release.yaml | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- dev.Dockerfile | 2 +- docker/btcd/Dockerfile | 2 +- docker/ltcd/Dockerfile | 2 +- lnrpc/Dockerfile | 2 +- make/builder.Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ba0fd40e..beea6e6e8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ env: # /dev.Dockerfile # /make/builder.Dockerfile # /.github/workflows/release.yml - GO_VERSION: 1.16.3 + GO_VERSION: 1.17.1 jobs: ######################## diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a6a603488..54fec93e5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ env: # /dev.Dockerfile # /make/builder.Dockerfile # /.github/workflows/main.yml - GO_VERSION: 1.16.3 + GO_VERSION: 1.17.1 jobs: main: diff --git a/.travis.yml b/.travis.yml index 1f34be556..6b979647f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ go: # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml - - 1.16.3 + - "1.17.x" env: global: diff --git a/Dockerfile b/Dockerfile index ae73313c0..38d47c189 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.16.3-alpine as builder +FROM golang:1.17.1-alpine as builder # Force Go to use the cgo based DNS resolver. This is required to ensure DNS # queries required to connect to linked containers succeed. diff --git a/dev.Dockerfile b/dev.Dockerfile index bbe201466..77dd03541 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -4,7 +4,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.16.3-alpine as builder +FROM golang:1.17.1-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index 73957d0de..a87d081a8 100644 --- a/docker/btcd/Dockerfile +++ b/docker/btcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3-alpine as builder +FROM golang:1.17.1-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/ltcd/Dockerfile b/docker/ltcd/Dockerfile index c49c066e1..944fb87f6 100644 --- a/docker/ltcd/Dockerfile +++ b/docker/ltcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3-alpine as builder +FROM golang:1.17.1-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index fd1d796ea..599a8f9fa 100644 --- a/lnrpc/Dockerfile +++ b/lnrpc/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3-buster +FROM golang:1.17.1-buster RUN apt-get update && apt-get install -y \ git \ diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile index 1273150b5..79f40325f 100644 --- a/make/builder.Dockerfile +++ b/make/builder.Dockerfile @@ -4,7 +4,7 @@ # /dev.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.16.3-buster +FROM golang:1.17.1-buster MAINTAINER Olaoluwa Osuntokun From 0b4e03f5fc58094c20020ebe4c077d5e0576e207 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 23 Aug 2021 10:35:48 +0200 Subject: [PATCH 3/7] multi: add golang 1.17 compatible build tags With go 1.17 a change to the build flags was implemented: https://go.googlesource.com/proposal/+/master/design/draft-gobuild.md The formatter now automatically adds the forward-compatible build tag format and the linter checks for them, so we need to include them in our code. --- aezeed/cipherseed_rpctest.go | 1 + build/deployment_dev.go | 1 + build/deployment_prod.go | 1 + build/log_default.go | 1 + build/log_nolog.go | 1 + build/log_stdlog.go | 1 + build/loglevel_critical.go | 1 + build/loglevel_debug.go | 1 + build/loglevel_default.go | 1 + build/loglevel_error.go | 1 + build/loglevel_info.go | 1 + build/loglevel_off.go | 1 + build/loglevel_trace.go | 1 + build/loglevel_warn.go | 1 + chainntnfs/bitcoindnotify/bitcoind_dev.go | 1 + chainntnfs/bitcoindnotify/bitcoind_test.go | 1 + chainntnfs/btcdnotify/btcd_dev.go | 1 + chainntnfs/btcdnotify/btcd_test.go | 1 + chainntnfs/interface_dev.go | 1 + chainntnfs/neutrinonotify/neutrino_dev.go | 1 + chainntnfs/test/bitcoind/bitcoind_test.go | 1 + chainntnfs/test/btcd/btcd_test.go | 1 + chainntnfs/test/neutrino/neutrino_test.go | 1 + chainntnfs/test/test_interface.go | 1 + chainntnfs/test_utils.go | 1 + cluster/etcd_elector.go | 1 + cluster/etcd_elector_factory.go | 1 + cluster/etcd_elector_test.go | 1 + cmd/lncli/autopilotrpc_active.go | 1 + cmd/lncli/autopilotrpc_default.go | 1 + cmd/lncli/invoicesrpc_active.go | 1 + cmd/lncli/invoicesrpc_default.go | 1 + cmd/lncli/walletrpc_active.go | 1 + cmd/lncli/walletrpc_default.go | 1 + cmd/lncli/watchtower_active.go | 1 + cmd/lncli/watchtower_default.go | 1 + funding/manager_test.go | 1 + fuzz/brontide/fuzz_utils.go | 1 + fuzz/brontide/random_actone.go | 1 + fuzz/brontide/random_actthree.go | 1 + fuzz/brontide/random_acttwo.go | 1 + fuzz/brontide/random_init_decrypt.go | 1 + fuzz/brontide/random_init_enc_dec.go | 1 + fuzz/brontide/random_init_encrypt.go | 1 + fuzz/brontide/random_resp_decrypt.go | 1 + fuzz/brontide/random_resp_enc_dec.go | 1 + fuzz/brontide/random_resp_encrypt.go | 1 + fuzz/brontide/static_actone.go | 1 + fuzz/brontide/static_actthree.go | 1 + fuzz/brontide/static_acttwo.go | 1 + fuzz/brontide/static_init_decrypt.go | 1 + fuzz/brontide/static_init_enc_dec.go | 1 + fuzz/brontide/static_init_encrypt.go | 1 + fuzz/brontide/static_resp_decrypt.go | 1 + fuzz/brontide/static_resp_enc_dec.go | 1 + fuzz/brontide/static_resp_encrypt.go | 1 + fuzz/lnwire/accept_channel.go | 1 + fuzz/lnwire/announce_signatures.go | 1 + fuzz/lnwire/channel_announcement.go | 1 + fuzz/lnwire/channel_reestablish.go | 1 + fuzz/lnwire/channel_update.go | 1 + fuzz/lnwire/closing_signed.go | 1 + fuzz/lnwire/commit_sig.go | 1 + fuzz/lnwire/error.go | 1 + fuzz/lnwire/funding_created.go | 1 + fuzz/lnwire/funding_locked.go | 1 + fuzz/lnwire/funding_signed.go | 1 + fuzz/lnwire/fuzz_utils.go | 1 + fuzz/lnwire/gossip_timestamp_range.go | 1 + fuzz/lnwire/init.go | 1 + fuzz/lnwire/node_announcement.go | 1 + fuzz/lnwire/open_channel.go | 1 + fuzz/lnwire/ping.go | 1 + fuzz/lnwire/pong.go | 1 + fuzz/lnwire/query_channel_range.go | 1 + fuzz/lnwire/query_short_chan_ids.go | 1 + fuzz/lnwire/query_short_chan_ids_zlib.go | 1 + fuzz/lnwire/reply_channel_range.go | 1 + fuzz/lnwire/reply_channel_range_zlib.go | 1 + fuzz/lnwire/reply_short_chan_ids_end.go | 1 + fuzz/lnwire/revoke_and_ack.go | 1 + fuzz/lnwire/shutdown.go | 1 + fuzz/lnwire/update_add_htlc.go | 1 + fuzz/lnwire/update_fail_htlc.go | 1 + fuzz/lnwire/update_fail_malformed_htlc.go | 1 + fuzz/lnwire/update_fee.go | 1 + fuzz/lnwire/update_fulfill_htlc.go | 1 + fuzz/wtwire/create_session.go | 1 + fuzz/wtwire/create_session_reply.go | 1 + fuzz/wtwire/delete_session.go | 1 + fuzz/wtwire/delete_session_reply.go | 1 + fuzz/wtwire/error.go | 1 + fuzz/wtwire/fuzz_utils.go | 1 + fuzz/wtwire/init.go | 1 + fuzz/wtwire/state_update.go | 1 + fuzz/wtwire/state_update_reply.go | 1 + fuzz/zpay32/decode.go | 1 + fuzz/zpay32/encode.go | 1 + healthcheck/diskcheck.go | 1 + htlcswitch/hodl/config_dev.go | 1 + htlcswitch/hodl/config_prod.go | 1 + htlcswitch/hodl/mask_dev.go | 1 + htlcswitch/hodl/mask_prod.go | 1 + kvdb/backend.go | 1 + kvdb/bolt_compact.go | 1 + kvdb/debug.go | 1 + kvdb/etcd/bucket.go | 1 + kvdb/etcd/commit_queue.go | 1 + kvdb/etcd/commit_queue_test.go | 1 + kvdb/etcd/db.go | 1 + kvdb/etcd/db_test.go | 1 + kvdb/etcd/debug.go | 1 + kvdb/etcd/driver.go | 1 + kvdb/etcd/driver_test.go | 1 + kvdb/etcd/embed.go | 1 + kvdb/etcd/fixture.go | 1 + kvdb/etcd/nodebug.go | 1 + kvdb/etcd/readwrite_bucket.go | 1 + kvdb/etcd/readwrite_cursor.go | 1 + kvdb/etcd/readwrite_tx.go | 1 + kvdb/etcd/readwrite_tx_test.go | 1 + kvdb/etcd/stm.go | 1 + kvdb/etcd/stm_test.go | 1 + kvdb/etcd/walletdb_interface_test.go | 1 + kvdb/etcd_test.go | 1 + kvdb/kvdb_etcd.go | 1 + kvdb/kvdb_no_etcd.go | 1 + kvdb/nodebug.go | 1 + lncfg/address_test.go | 1 + lncfg/monitoring_off.go | 1 + lncfg/monitoring_on.go | 1 + lncfg/protocol.go | 1 + lncfg/protocol_experimental_off.go | 1 + lncfg/protocol_experimental_on.go | 1 + lncfg/protocol_legacy_off.go | 1 + lncfg/protocol_legacy_on.go | 1 + lncfg/protocol_rpctest.go | 1 + lnrpc/autopilotrpc/autopilot_server.go | 1 + lnrpc/autopilotrpc/config_active.go | 1 + lnrpc/autopilotrpc/config_default.go | 1 + lnrpc/autopilotrpc/driver.go | 1 + lnrpc/chainrpc/chainnotifier_server.go | 1 + lnrpc/chainrpc/config_active.go | 1 + lnrpc/chainrpc/config_default.go | 1 + lnrpc/chainrpc/driver.go | 1 + lnrpc/invoicesrpc/config_active.go | 1 + lnrpc/invoicesrpc/config_default.go | 1 + lnrpc/invoicesrpc/driver.go | 1 + lnrpc/invoicesrpc/invoices_server.go | 1 + lnrpc/signrpc/config_active.go | 1 + lnrpc/signrpc/config_default.go | 1 + lnrpc/signrpc/driver.go | 1 + lnrpc/signrpc/signer_server.go | 1 + lnrpc/walletrpc/config_active.go | 1 + lnrpc/walletrpc/config_default.go | 1 + lnrpc/walletrpc/driver.go | 1 + lnrpc/walletrpc/psbt.go | 1 + lnrpc/walletrpc/walletkit_server.go | 1 + lnrpc/watchtowerrpc/config_active.go | 1 + lnrpc/watchtowerrpc/config_default.go | 1 + lnrpc/watchtowerrpc/driver.go | 1 + lnrpc/watchtowerrpc/handler.go | 1 + lntest/bitcoind.go | 4 ++-- lntest/bitcoind_common.go | 1 + lntest/bitcoind_notxindex.go | 4 ++-- lntest/btcd.go | 1 + lntest/itest/lnd_etcd_failover_test.go | 1 + lntest/itest/lnd_max_channel_size_test.go | 1 + lntest/itest/lnd_no_etcd_dummy_failover_test.go | 1 + lntest/itest/lnd_test_list_off_test.go | 1 + lntest/itest/lnd_test_list_on_test.go | 1 + lntest/neutrino.go | 1 + lntest/timeouts.go | 1 + lntest/timeouts_darwin.go | 1 + lntest/timeouts_remote_db.go | 1 + lnwallet/btcwallet/btcwallet_rpctest.go | 1 + lnwallet/revocation_producer.go | 1 + lnwallet/revocation_producer_itest.go | 1 + macaroons/security.go | 1 + macaroons/security_rpctest.go | 1 + mobile/bindings.go | 1 + monitoring/monitoring_off.go | 1 + monitoring/monitoring_on.go | 1 + server_test.go | 1 + sweep/defaults.go | 1 + sweep/defaults_rpctest.go | 1 + tools.go | 1 + 187 files changed, 189 insertions(+), 4 deletions(-) diff --git a/aezeed/cipherseed_rpctest.go b/aezeed/cipherseed_rpctest.go index 82f782cd2..1fb25e31f 100644 --- a/aezeed/cipherseed_rpctest.go +++ b/aezeed/cipherseed_rpctest.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package aezeed diff --git a/build/deployment_dev.go b/build/deployment_dev.go index fb2bb2b94..a26ebd0e9 100644 --- a/build/deployment_dev.go +++ b/build/deployment_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package build diff --git a/build/deployment_prod.go b/build/deployment_prod.go index 247f25aec..255c1e186 100644 --- a/build/deployment_prod.go +++ b/build/deployment_prod.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package build diff --git a/build/log_default.go b/build/log_default.go index 399a00df2..bbb6d4c39 100644 --- a/build/log_default.go +++ b/build/log_default.go @@ -1,3 +1,4 @@ +//go:build !stdlog && !nolog // +build !stdlog,!nolog package build diff --git a/build/log_nolog.go b/build/log_nolog.go index 0aa15bc43..32199ada0 100644 --- a/build/log_nolog.go +++ b/build/log_nolog.go @@ -1,3 +1,4 @@ +//go:build nolog // +build nolog package build diff --git a/build/log_stdlog.go b/build/log_stdlog.go index a495eaecf..34a8c1bf0 100644 --- a/build/log_stdlog.go +++ b/build/log_stdlog.go @@ -1,3 +1,4 @@ +//go:build stdlog // +build stdlog package build diff --git a/build/loglevel_critical.go b/build/loglevel_critical.go index 2e3a3734e..8decb83a0 100644 --- a/build/loglevel_critical.go +++ b/build/loglevel_critical.go @@ -1,3 +1,4 @@ +//go:build dev && critical // +build dev,critical package build diff --git a/build/loglevel_debug.go b/build/loglevel_debug.go index 7d22c90a4..c80afec19 100644 --- a/build/loglevel_debug.go +++ b/build/loglevel_debug.go @@ -1,3 +1,4 @@ +//go:build dev && debug // +build dev,debug package build diff --git a/build/loglevel_default.go b/build/loglevel_default.go index 5e12ffcc1..52fe12243 100644 --- a/build/loglevel_default.go +++ b/build/loglevel_default.go @@ -1,3 +1,4 @@ +//go:build !info && !debug && !trace && !warn && !error && !critical && !off // +build !info,!debug,!trace,!warn,!error,!critical,!off package build diff --git a/build/loglevel_error.go b/build/loglevel_error.go index 81e3849e0..5fbdb999d 100644 --- a/build/loglevel_error.go +++ b/build/loglevel_error.go @@ -1,3 +1,4 @@ +//go:build dev && error // +build dev,error package build diff --git a/build/loglevel_info.go b/build/loglevel_info.go index f0d6dca0e..c367f649d 100644 --- a/build/loglevel_info.go +++ b/build/loglevel_info.go @@ -1,3 +1,4 @@ +//go:build dev && info // +build dev,info package build diff --git a/build/loglevel_off.go b/build/loglevel_off.go index d6c65e77d..077dcd0a5 100644 --- a/build/loglevel_off.go +++ b/build/loglevel_off.go @@ -1,3 +1,4 @@ +//go:build dev && off // +build dev,off package build diff --git a/build/loglevel_trace.go b/build/loglevel_trace.go index ec17e9dda..1d9eed671 100644 --- a/build/loglevel_trace.go +++ b/build/loglevel_trace.go @@ -1,3 +1,4 @@ +//go:build dev && trace // +build dev,trace package build diff --git a/build/loglevel_warn.go b/build/loglevel_warn.go index a8fdfc296..84368ee6c 100644 --- a/build/loglevel_warn.go +++ b/build/loglevel_warn.go @@ -1,3 +1,4 @@ +//go:build dev && warn // +build dev,warn package build diff --git a/chainntnfs/bitcoindnotify/bitcoind_dev.go b/chainntnfs/bitcoindnotify/bitcoind_dev.go index 99080b388..d71caf4df 100644 --- a/chainntnfs/bitcoindnotify/bitcoind_dev.go +++ b/chainntnfs/bitcoindnotify/bitcoind_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package bitcoindnotify diff --git a/chainntnfs/bitcoindnotify/bitcoind_test.go b/chainntnfs/bitcoindnotify/bitcoind_test.go index 4b670854f..a3568c168 100644 --- a/chainntnfs/bitcoindnotify/bitcoind_test.go +++ b/chainntnfs/bitcoindnotify/bitcoind_test.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package bitcoindnotify diff --git a/chainntnfs/btcdnotify/btcd_dev.go b/chainntnfs/btcdnotify/btcd_dev.go index 4723c0deb..11b20ff7c 100644 --- a/chainntnfs/btcdnotify/btcd_dev.go +++ b/chainntnfs/btcdnotify/btcd_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package btcdnotify diff --git a/chainntnfs/btcdnotify/btcd_test.go b/chainntnfs/btcdnotify/btcd_test.go index 798275f06..16782d463 100644 --- a/chainntnfs/btcdnotify/btcd_test.go +++ b/chainntnfs/btcdnotify/btcd_test.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package btcdnotify diff --git a/chainntnfs/interface_dev.go b/chainntnfs/interface_dev.go index ac00fa8db..eb3072247 100644 --- a/chainntnfs/interface_dev.go +++ b/chainntnfs/interface_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package chainntnfs diff --git a/chainntnfs/neutrinonotify/neutrino_dev.go b/chainntnfs/neutrinonotify/neutrino_dev.go index d19783cce..e70cdf4d0 100644 --- a/chainntnfs/neutrinonotify/neutrino_dev.go +++ b/chainntnfs/neutrinonotify/neutrino_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package neutrinonotify diff --git a/chainntnfs/test/bitcoind/bitcoind_test.go b/chainntnfs/test/bitcoind/bitcoind_test.go index df9d3853a..32335e7bb 100644 --- a/chainntnfs/test/bitcoind/bitcoind_test.go +++ b/chainntnfs/test/bitcoind/bitcoind_test.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package bitcoind_test diff --git a/chainntnfs/test/btcd/btcd_test.go b/chainntnfs/test/btcd/btcd_test.go index 320d6d8a6..5ef448364 100644 --- a/chainntnfs/test/btcd/btcd_test.go +++ b/chainntnfs/test/btcd/btcd_test.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package btcd_test diff --git a/chainntnfs/test/neutrino/neutrino_test.go b/chainntnfs/test/neutrino/neutrino_test.go index ac6a09cf2..e8be85371 100644 --- a/chainntnfs/test/neutrino/neutrino_test.go +++ b/chainntnfs/test/neutrino/neutrino_test.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package neutrino_test diff --git a/chainntnfs/test/test_interface.go b/chainntnfs/test/test_interface.go index f894e7745..bdbb532f8 100644 --- a/chainntnfs/test/test_interface.go +++ b/chainntnfs/test/test_interface.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package chainntnfstest diff --git a/chainntnfs/test_utils.go b/chainntnfs/test_utils.go index 5b7cc34f3..291c26a64 100644 --- a/chainntnfs/test_utils.go +++ b/chainntnfs/test_utils.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package chainntnfs diff --git a/cluster/etcd_elector.go b/cluster/etcd_elector.go index acd0276a9..a33ff24cf 100644 --- a/cluster/etcd_elector.go +++ b/cluster/etcd_elector.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package cluster diff --git a/cluster/etcd_elector_factory.go b/cluster/etcd_elector_factory.go index 2863433dd..75182d475 100644 --- a/cluster/etcd_elector_factory.go +++ b/cluster/etcd_elector_factory.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package cluster diff --git a/cluster/etcd_elector_test.go b/cluster/etcd_elector_test.go index b7f6e24c5..65587eddc 100644 --- a/cluster/etcd_elector_test.go +++ b/cluster/etcd_elector_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package cluster diff --git a/cmd/lncli/autopilotrpc_active.go b/cmd/lncli/autopilotrpc_active.go index d0d60ff25..961e85994 100644 --- a/cmd/lncli/autopilotrpc_active.go +++ b/cmd/lncli/autopilotrpc_active.go @@ -1,3 +1,4 @@ +//go:build autopilotrpc // +build autopilotrpc package main diff --git a/cmd/lncli/autopilotrpc_default.go b/cmd/lncli/autopilotrpc_default.go index 49061254f..7fb885217 100644 --- a/cmd/lncli/autopilotrpc_default.go +++ b/cmd/lncli/autopilotrpc_default.go @@ -1,3 +1,4 @@ +//go:build !autopilotrpc // +build !autopilotrpc package main diff --git a/cmd/lncli/invoicesrpc_active.go b/cmd/lncli/invoicesrpc_active.go index 3df513603..b708e0f62 100644 --- a/cmd/lncli/invoicesrpc_active.go +++ b/cmd/lncli/invoicesrpc_active.go @@ -1,3 +1,4 @@ +//go:build invoicesrpc // +build invoicesrpc package main diff --git a/cmd/lncli/invoicesrpc_default.go b/cmd/lncli/invoicesrpc_default.go index 570dfa694..cca3c14e9 100644 --- a/cmd/lncli/invoicesrpc_default.go +++ b/cmd/lncli/invoicesrpc_default.go @@ -1,3 +1,4 @@ +//go:build !invoicesrpc // +build !invoicesrpc package main diff --git a/cmd/lncli/walletrpc_active.go b/cmd/lncli/walletrpc_active.go index fa6104d35..460635f0e 100644 --- a/cmd/lncli/walletrpc_active.go +++ b/cmd/lncli/walletrpc_active.go @@ -1,3 +1,4 @@ +//go:build walletrpc // +build walletrpc package main diff --git a/cmd/lncli/walletrpc_default.go b/cmd/lncli/walletrpc_default.go index f919a9933..d6670e449 100644 --- a/cmd/lncli/walletrpc_default.go +++ b/cmd/lncli/walletrpc_default.go @@ -1,3 +1,4 @@ +//go:build !walletrpc // +build !walletrpc package main diff --git a/cmd/lncli/watchtower_active.go b/cmd/lncli/watchtower_active.go index f8b6b9e71..9c31c6ec4 100644 --- a/cmd/lncli/watchtower_active.go +++ b/cmd/lncli/watchtower_active.go @@ -1,3 +1,4 @@ +//go:build watchtowerrpc // +build watchtowerrpc package main diff --git a/cmd/lncli/watchtower_default.go b/cmd/lncli/watchtower_default.go index 41d887a9c..e3db3ccf3 100644 --- a/cmd/lncli/watchtower_default.go +++ b/cmd/lncli/watchtower_default.go @@ -1,3 +1,4 @@ +//go:build !watchtowerrpc // +build !watchtowerrpc package main diff --git a/funding/manager_test.go b/funding/manager_test.go index 1a3f9905d..636f4b0fb 100644 --- a/funding/manager_test.go +++ b/funding/manager_test.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package funding diff --git a/fuzz/brontide/fuzz_utils.go b/fuzz/brontide/fuzz_utils.go index 57370f7cb..ab846efa5 100644 --- a/fuzz/brontide/fuzz_utils.go +++ b/fuzz/brontide/fuzz_utils.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_actone.go b/fuzz/brontide/random_actone.go index efa888b9f..7d2e0c078 100644 --- a/fuzz/brontide/random_actone.go +++ b/fuzz/brontide/random_actone.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_actthree.go b/fuzz/brontide/random_actthree.go index 6b0517712..fe0c70765 100644 --- a/fuzz/brontide/random_actthree.go +++ b/fuzz/brontide/random_actthree.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_acttwo.go b/fuzz/brontide/random_acttwo.go index 8ff2f7eb6..8cef21b7b 100644 --- a/fuzz/brontide/random_acttwo.go +++ b/fuzz/brontide/random_acttwo.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_init_decrypt.go b/fuzz/brontide/random_init_decrypt.go index 3328a2b6b..b9a4aac52 100644 --- a/fuzz/brontide/random_init_decrypt.go +++ b/fuzz/brontide/random_init_decrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_init_enc_dec.go b/fuzz/brontide/random_init_enc_dec.go index 6f1a73124..7d79cfc45 100644 --- a/fuzz/brontide/random_init_enc_dec.go +++ b/fuzz/brontide/random_init_enc_dec.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_init_encrypt.go b/fuzz/brontide/random_init_encrypt.go index 76f5dacd5..50f784c45 100644 --- a/fuzz/brontide/random_init_encrypt.go +++ b/fuzz/brontide/random_init_encrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_resp_decrypt.go b/fuzz/brontide/random_resp_decrypt.go index 1ae40bd27..9bb44faa1 100644 --- a/fuzz/brontide/random_resp_decrypt.go +++ b/fuzz/brontide/random_resp_decrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_resp_enc_dec.go b/fuzz/brontide/random_resp_enc_dec.go index f84e7c474..9d50816a2 100644 --- a/fuzz/brontide/random_resp_enc_dec.go +++ b/fuzz/brontide/random_resp_enc_dec.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/random_resp_encrypt.go b/fuzz/brontide/random_resp_encrypt.go index 5ac9abadf..c72f64df5 100644 --- a/fuzz/brontide/random_resp_encrypt.go +++ b/fuzz/brontide/random_resp_encrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_actone.go b/fuzz/brontide/static_actone.go index 9400255de..ee9700aff 100644 --- a/fuzz/brontide/static_actone.go +++ b/fuzz/brontide/static_actone.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_actthree.go b/fuzz/brontide/static_actthree.go index b28abace1..61fa00b23 100644 --- a/fuzz/brontide/static_actthree.go +++ b/fuzz/brontide/static_actthree.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_acttwo.go b/fuzz/brontide/static_acttwo.go index 463ebab39..e7e12326f 100644 --- a/fuzz/brontide/static_acttwo.go +++ b/fuzz/brontide/static_acttwo.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_init_decrypt.go b/fuzz/brontide/static_init_decrypt.go index 35525d203..9a39c8031 100644 --- a/fuzz/brontide/static_init_decrypt.go +++ b/fuzz/brontide/static_init_decrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_init_enc_dec.go b/fuzz/brontide/static_init_enc_dec.go index 81669db2c..5a33aabf9 100644 --- a/fuzz/brontide/static_init_enc_dec.go +++ b/fuzz/brontide/static_init_enc_dec.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_init_encrypt.go b/fuzz/brontide/static_init_encrypt.go index 6c45a0b2e..6375dd4d5 100644 --- a/fuzz/brontide/static_init_encrypt.go +++ b/fuzz/brontide/static_init_encrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_resp_decrypt.go b/fuzz/brontide/static_resp_decrypt.go index fee4500b5..140a52bbc 100644 --- a/fuzz/brontide/static_resp_decrypt.go +++ b/fuzz/brontide/static_resp_decrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_resp_enc_dec.go b/fuzz/brontide/static_resp_enc_dec.go index aaa7c3e8c..1f0f31b9a 100644 --- a/fuzz/brontide/static_resp_enc_dec.go +++ b/fuzz/brontide/static_resp_enc_dec.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/brontide/static_resp_encrypt.go b/fuzz/brontide/static_resp_encrypt.go index 5fdc90363..9c957fb15 100644 --- a/fuzz/brontide/static_resp_encrypt.go +++ b/fuzz/brontide/static_resp_encrypt.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package brontidefuzz diff --git a/fuzz/lnwire/accept_channel.go b/fuzz/lnwire/accept_channel.go index 5f20a8584..f57c2af42 100644 --- a/fuzz/lnwire/accept_channel.go +++ b/fuzz/lnwire/accept_channel.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/announce_signatures.go b/fuzz/lnwire/announce_signatures.go index 68263786a..c35d5a248 100644 --- a/fuzz/lnwire/announce_signatures.go +++ b/fuzz/lnwire/announce_signatures.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/channel_announcement.go b/fuzz/lnwire/channel_announcement.go index 2b0c2ff0d..92800185b 100644 --- a/fuzz/lnwire/channel_announcement.go +++ b/fuzz/lnwire/channel_announcement.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/channel_reestablish.go b/fuzz/lnwire/channel_reestablish.go index 324f0afc3..841142c1c 100644 --- a/fuzz/lnwire/channel_reestablish.go +++ b/fuzz/lnwire/channel_reestablish.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/channel_update.go b/fuzz/lnwire/channel_update.go index 29bb7d377..cce82442c 100644 --- a/fuzz/lnwire/channel_update.go +++ b/fuzz/lnwire/channel_update.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/closing_signed.go b/fuzz/lnwire/closing_signed.go index 7ecf96aa1..4d3dd59f1 100644 --- a/fuzz/lnwire/closing_signed.go +++ b/fuzz/lnwire/closing_signed.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/commit_sig.go b/fuzz/lnwire/commit_sig.go index 7133f1147..7dae96518 100644 --- a/fuzz/lnwire/commit_sig.go +++ b/fuzz/lnwire/commit_sig.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/error.go b/fuzz/lnwire/error.go index 37481f078..f613606e4 100644 --- a/fuzz/lnwire/error.go +++ b/fuzz/lnwire/error.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/funding_created.go b/fuzz/lnwire/funding_created.go index bb37869c7..a14b1083f 100644 --- a/fuzz/lnwire/funding_created.go +++ b/fuzz/lnwire/funding_created.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/funding_locked.go b/fuzz/lnwire/funding_locked.go index 1144225e3..c5512f97e 100644 --- a/fuzz/lnwire/funding_locked.go +++ b/fuzz/lnwire/funding_locked.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/funding_signed.go b/fuzz/lnwire/funding_signed.go index f3a11cef2..1af68add6 100644 --- a/fuzz/lnwire/funding_signed.go +++ b/fuzz/lnwire/funding_signed.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/fuzz_utils.go b/fuzz/lnwire/fuzz_utils.go index fda7517e5..98ab50bce 100644 --- a/fuzz/lnwire/fuzz_utils.go +++ b/fuzz/lnwire/fuzz_utils.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/gossip_timestamp_range.go b/fuzz/lnwire/gossip_timestamp_range.go index da56594c9..5cfe89170 100644 --- a/fuzz/lnwire/gossip_timestamp_range.go +++ b/fuzz/lnwire/gossip_timestamp_range.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/init.go b/fuzz/lnwire/init.go index 3f0c0c806..3a10fb675 100644 --- a/fuzz/lnwire/init.go +++ b/fuzz/lnwire/init.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/node_announcement.go b/fuzz/lnwire/node_announcement.go index 8826e0264..7f73c8371 100644 --- a/fuzz/lnwire/node_announcement.go +++ b/fuzz/lnwire/node_announcement.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/open_channel.go b/fuzz/lnwire/open_channel.go index 4942c5b67..c7ab024a9 100644 --- a/fuzz/lnwire/open_channel.go +++ b/fuzz/lnwire/open_channel.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/ping.go b/fuzz/lnwire/ping.go index 4cdb629e0..2147dc8a6 100644 --- a/fuzz/lnwire/ping.go +++ b/fuzz/lnwire/ping.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/pong.go b/fuzz/lnwire/pong.go index 31df6ca3e..bc8b1a174 100644 --- a/fuzz/lnwire/pong.go +++ b/fuzz/lnwire/pong.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/query_channel_range.go b/fuzz/lnwire/query_channel_range.go index 87b69afb4..c8bdbc2db 100644 --- a/fuzz/lnwire/query_channel_range.go +++ b/fuzz/lnwire/query_channel_range.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/query_short_chan_ids.go b/fuzz/lnwire/query_short_chan_ids.go index 8830eea3b..8d4e99368 100644 --- a/fuzz/lnwire/query_short_chan_ids.go +++ b/fuzz/lnwire/query_short_chan_ids.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/query_short_chan_ids_zlib.go b/fuzz/lnwire/query_short_chan_ids_zlib.go index 2d2573664..eaf1e1f77 100644 --- a/fuzz/lnwire/query_short_chan_ids_zlib.go +++ b/fuzz/lnwire/query_short_chan_ids_zlib.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/reply_channel_range.go b/fuzz/lnwire/reply_channel_range.go index 8a2d7f13c..e1611aa77 100644 --- a/fuzz/lnwire/reply_channel_range.go +++ b/fuzz/lnwire/reply_channel_range.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/reply_channel_range_zlib.go b/fuzz/lnwire/reply_channel_range_zlib.go index af04efd54..fe2517179 100644 --- a/fuzz/lnwire/reply_channel_range_zlib.go +++ b/fuzz/lnwire/reply_channel_range_zlib.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/reply_short_chan_ids_end.go b/fuzz/lnwire/reply_short_chan_ids_end.go index 7e5c96570..b91f3b548 100644 --- a/fuzz/lnwire/reply_short_chan_ids_end.go +++ b/fuzz/lnwire/reply_short_chan_ids_end.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/revoke_and_ack.go b/fuzz/lnwire/revoke_and_ack.go index bab5d118b..276ba7c21 100644 --- a/fuzz/lnwire/revoke_and_ack.go +++ b/fuzz/lnwire/revoke_and_ack.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/shutdown.go b/fuzz/lnwire/shutdown.go index 5e855b713..84e40cc7c 100644 --- a/fuzz/lnwire/shutdown.go +++ b/fuzz/lnwire/shutdown.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/update_add_htlc.go b/fuzz/lnwire/update_add_htlc.go index 2ea7b4af2..3ec84ff9b 100644 --- a/fuzz/lnwire/update_add_htlc.go +++ b/fuzz/lnwire/update_add_htlc.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/update_fail_htlc.go b/fuzz/lnwire/update_fail_htlc.go index 33cd9b1ff..77b4bac8e 100644 --- a/fuzz/lnwire/update_fail_htlc.go +++ b/fuzz/lnwire/update_fail_htlc.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/update_fail_malformed_htlc.go b/fuzz/lnwire/update_fail_malformed_htlc.go index d7dc97680..38ddfdf18 100644 --- a/fuzz/lnwire/update_fail_malformed_htlc.go +++ b/fuzz/lnwire/update_fail_malformed_htlc.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/update_fee.go b/fuzz/lnwire/update_fee.go index cdb045689..228d12fdb 100644 --- a/fuzz/lnwire/update_fee.go +++ b/fuzz/lnwire/update_fee.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/lnwire/update_fulfill_htlc.go b/fuzz/lnwire/update_fulfill_htlc.go index 6887cac83..241f37c74 100644 --- a/fuzz/lnwire/update_fulfill_htlc.go +++ b/fuzz/lnwire/update_fulfill_htlc.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package lnwirefuzz diff --git a/fuzz/wtwire/create_session.go b/fuzz/wtwire/create_session.go index df521bf40..b2bd3e705 100644 --- a/fuzz/wtwire/create_session.go +++ b/fuzz/wtwire/create_session.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/create_session_reply.go b/fuzz/wtwire/create_session_reply.go index a0e07f85f..e862e3e36 100644 --- a/fuzz/wtwire/create_session_reply.go +++ b/fuzz/wtwire/create_session_reply.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/delete_session.go b/fuzz/wtwire/delete_session.go index 2cb56225c..cca278093 100644 --- a/fuzz/wtwire/delete_session.go +++ b/fuzz/wtwire/delete_session.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/delete_session_reply.go b/fuzz/wtwire/delete_session_reply.go index 0f0360f1a..ec890aa11 100644 --- a/fuzz/wtwire/delete_session_reply.go +++ b/fuzz/wtwire/delete_session_reply.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/error.go b/fuzz/wtwire/error.go index f0f5fae23..7d73e1f30 100644 --- a/fuzz/wtwire/error.go +++ b/fuzz/wtwire/error.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/fuzz_utils.go b/fuzz/wtwire/fuzz_utils.go index a62e4852f..06a00a2de 100644 --- a/fuzz/wtwire/fuzz_utils.go +++ b/fuzz/wtwire/fuzz_utils.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/init.go b/fuzz/wtwire/init.go index 31112b8f2..ea157a646 100644 --- a/fuzz/wtwire/init.go +++ b/fuzz/wtwire/init.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/state_update.go b/fuzz/wtwire/state_update.go index 5d13568ef..82323e146 100644 --- a/fuzz/wtwire/state_update.go +++ b/fuzz/wtwire/state_update.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/wtwire/state_update_reply.go b/fuzz/wtwire/state_update_reply.go index fb7a3bbb8..c645031d4 100644 --- a/fuzz/wtwire/state_update_reply.go +++ b/fuzz/wtwire/state_update_reply.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package wtwirefuzz diff --git a/fuzz/zpay32/decode.go b/fuzz/zpay32/decode.go index 0c1d1e5ad..a5573e208 100644 --- a/fuzz/zpay32/decode.go +++ b/fuzz/zpay32/decode.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package zpay32fuzz diff --git a/fuzz/zpay32/encode.go b/fuzz/zpay32/encode.go index 4734a5785..ac2894936 100644 --- a/fuzz/zpay32/encode.go +++ b/fuzz/zpay32/encode.go @@ -1,3 +1,4 @@ +//go:build gofuzz // +build gofuzz package zpay32fuzz diff --git a/healthcheck/diskcheck.go b/healthcheck/diskcheck.go index 087fc7a78..ec2fa6a15 100644 --- a/healthcheck/diskcheck.go +++ b/healthcheck/diskcheck.go @@ -1,3 +1,4 @@ +//go:build !windows && !solaris && !netbsd && !openbsd && !js // +build !windows,!solaris,!netbsd,!openbsd,!js package healthcheck diff --git a/htlcswitch/hodl/config_dev.go b/htlcswitch/hodl/config_dev.go index ef8389adb..00eb6c8ad 100644 --- a/htlcswitch/hodl/config_dev.go +++ b/htlcswitch/hodl/config_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package hodl diff --git a/htlcswitch/hodl/config_prod.go b/htlcswitch/hodl/config_prod.go index c5e9e9340..4dd1b2304 100644 --- a/htlcswitch/hodl/config_prod.go +++ b/htlcswitch/hodl/config_prod.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package hodl diff --git a/htlcswitch/hodl/mask_dev.go b/htlcswitch/hodl/mask_dev.go index a1d50ff06..500f4248b 100644 --- a/htlcswitch/hodl/mask_dev.go +++ b/htlcswitch/hodl/mask_dev.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package hodl diff --git a/htlcswitch/hodl/mask_prod.go b/htlcswitch/hodl/mask_prod.go index 1b8a4b70a..a0d4bb56a 100644 --- a/htlcswitch/hodl/mask_prod.go +++ b/htlcswitch/hodl/mask_prod.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package hodl diff --git a/kvdb/backend.go b/kvdb/backend.go index 9bf210c41..014260b2f 100644 --- a/kvdb/backend.go +++ b/kvdb/backend.go @@ -1,3 +1,4 @@ +//go:build !js // +build !js package kvdb diff --git a/kvdb/bolt_compact.go b/kvdb/bolt_compact.go index 66203ff9a..7da51b3d3 100644 --- a/kvdb/bolt_compact.go +++ b/kvdb/bolt_compact.go @@ -2,6 +2,7 @@ // implemented in this file: // https://github.com/etcd-io/bbolt/blob/master/cmd/bbolt/main.go +//go:build !js // +build !js package kvdb diff --git a/kvdb/debug.go b/kvdb/debug.go index 07874bea6..c480954c1 100644 --- a/kvdb/debug.go +++ b/kvdb/debug.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package kvdb diff --git a/kvdb/etcd/bucket.go b/kvdb/etcd/bucket.go index 514eab630..ed548db7c 100644 --- a/kvdb/etcd/bucket.go +++ b/kvdb/etcd/bucket.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/commit_queue.go b/kvdb/etcd/commit_queue.go index 138c08e68..e1afb4a8a 100644 --- a/kvdb/etcd/commit_queue.go +++ b/kvdb/etcd/commit_queue.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/commit_queue_test.go b/kvdb/etcd/commit_queue_test.go index a7ebcca2b..900b08ca7 100644 --- a/kvdb/etcd/commit_queue_test.go +++ b/kvdb/etcd/commit_queue_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/db.go b/kvdb/etcd/db.go index 491056436..315359ecd 100644 --- a/kvdb/etcd/db.go +++ b/kvdb/etcd/db.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/db_test.go b/kvdb/etcd/db_test.go index ebb044f42..6f8f85b44 100644 --- a/kvdb/etcd/db_test.go +++ b/kvdb/etcd/db_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/debug.go b/kvdb/etcd/debug.go index 5b67b0bbf..f76d3f930 100644 --- a/kvdb/etcd/debug.go +++ b/kvdb/etcd/debug.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package etcd diff --git a/kvdb/etcd/driver.go b/kvdb/etcd/driver.go index 39a9deb99..2642c134d 100644 --- a/kvdb/etcd/driver.go +++ b/kvdb/etcd/driver.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/driver_test.go b/kvdb/etcd/driver_test.go index ea4196eff..bca3293dc 100644 --- a/kvdb/etcd/driver_test.go +++ b/kvdb/etcd/driver_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/embed.go b/kvdb/etcd/embed.go index a4f969149..0df2f804f 100644 --- a/kvdb/etcd/embed.go +++ b/kvdb/etcd/embed.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/fixture.go b/kvdb/etcd/fixture.go index 3a32ba09b..4dde37cc9 100644 --- a/kvdb/etcd/fixture.go +++ b/kvdb/etcd/fixture.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/nodebug.go b/kvdb/etcd/nodebug.go index 9494f8ccf..1a9767a93 100644 --- a/kvdb/etcd/nodebug.go +++ b/kvdb/etcd/nodebug.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package etcd diff --git a/kvdb/etcd/readwrite_bucket.go b/kvdb/etcd/readwrite_bucket.go index 23162f852..790074332 100644 --- a/kvdb/etcd/readwrite_bucket.go +++ b/kvdb/etcd/readwrite_bucket.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/readwrite_cursor.go b/kvdb/etcd/readwrite_cursor.go index 123f2a5c8..272e48138 100644 --- a/kvdb/etcd/readwrite_cursor.go +++ b/kvdb/etcd/readwrite_cursor.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/readwrite_tx.go b/kvdb/etcd/readwrite_tx.go index 8e580d5af..fcd1469ba 100644 --- a/kvdb/etcd/readwrite_tx.go +++ b/kvdb/etcd/readwrite_tx.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/readwrite_tx_test.go b/kvdb/etcd/readwrite_tx_test.go index 7c0c296de..41f916697 100644 --- a/kvdb/etcd/readwrite_tx_test.go +++ b/kvdb/etcd/readwrite_tx_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/stm.go b/kvdb/etcd/stm.go index 7ef9776b2..3a3d20233 100644 --- a/kvdb/etcd/stm.go +++ b/kvdb/etcd/stm.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/stm_test.go b/kvdb/etcd/stm_test.go index 5f311c8f7..ee556335c 100644 --- a/kvdb/etcd/stm_test.go +++ b/kvdb/etcd/stm_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd/walletdb_interface_test.go b/kvdb/etcd/walletdb_interface_test.go index bdf2680dd..c37a137fe 100644 --- a/kvdb/etcd/walletdb_interface_test.go +++ b/kvdb/etcd/walletdb_interface_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package etcd diff --git a/kvdb/etcd_test.go b/kvdb/etcd_test.go index c5e40a9fc..aae165318 100644 --- a/kvdb/etcd_test.go +++ b/kvdb/etcd_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package kvdb diff --git a/kvdb/kvdb_etcd.go b/kvdb/kvdb_etcd.go index 0637baf24..017388a3f 100644 --- a/kvdb/kvdb_etcd.go +++ b/kvdb/kvdb_etcd.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package kvdb diff --git a/kvdb/kvdb_no_etcd.go b/kvdb/kvdb_no_etcd.go index 588fce37f..ad56a3775 100644 --- a/kvdb/kvdb_no_etcd.go +++ b/kvdb/kvdb_no_etcd.go @@ -1,3 +1,4 @@ +//go:build !kvdb_etcd // +build !kvdb_etcd package kvdb diff --git a/kvdb/nodebug.go b/kvdb/nodebug.go index 76225182b..b29e34a54 100644 --- a/kvdb/nodebug.go +++ b/kvdb/nodebug.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package kvdb diff --git a/lncfg/address_test.go b/lncfg/address_test.go index 208b0407e..009093e75 100644 --- a/lncfg/address_test.go +++ b/lncfg/address_test.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package lncfg diff --git a/lncfg/monitoring_off.go b/lncfg/monitoring_off.go index 5ee21a12f..ad8375f90 100644 --- a/lncfg/monitoring_off.go +++ b/lncfg/monitoring_off.go @@ -1,3 +1,4 @@ +//go:build !monitoring // +build !monitoring package lncfg diff --git a/lncfg/monitoring_on.go b/lncfg/monitoring_on.go index dc31e51d9..872b46330 100644 --- a/lncfg/monitoring_on.go +++ b/lncfg/monitoring_on.go @@ -1,3 +1,4 @@ +//go:build monitoring // +build monitoring package lncfg diff --git a/lncfg/protocol.go b/lncfg/protocol.go index afc129680..1c2491172 100644 --- a/lncfg/protocol.go +++ b/lncfg/protocol.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package lncfg diff --git a/lncfg/protocol_experimental_off.go b/lncfg/protocol_experimental_off.go index a4f32c035..34143a224 100644 --- a/lncfg/protocol_experimental_off.go +++ b/lncfg/protocol_experimental_off.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package lncfg diff --git a/lncfg/protocol_experimental_on.go b/lncfg/protocol_experimental_on.go index d12fb9822..b7d74acfe 100644 --- a/lncfg/protocol_experimental_on.go +++ b/lncfg/protocol_experimental_on.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package lncfg diff --git a/lncfg/protocol_legacy_off.go b/lncfg/protocol_legacy_off.go index 060569d83..4dc0a814c 100644 --- a/lncfg/protocol_legacy_off.go +++ b/lncfg/protocol_legacy_off.go @@ -1,3 +1,4 @@ +//go:build !dev // +build !dev package lncfg diff --git a/lncfg/protocol_legacy_on.go b/lncfg/protocol_legacy_on.go index 712d5fede..699f89411 100644 --- a/lncfg/protocol_legacy_on.go +++ b/lncfg/protocol_legacy_on.go @@ -1,3 +1,4 @@ +//go:build dev // +build dev package lncfg diff --git a/lncfg/protocol_rpctest.go b/lncfg/protocol_rpctest.go index 037aec777..910b9ed31 100644 --- a/lncfg/protocol_rpctest.go +++ b/lncfg/protocol_rpctest.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package lncfg diff --git a/lnrpc/autopilotrpc/autopilot_server.go b/lnrpc/autopilotrpc/autopilot_server.go index 215f14f8d..ee8bbc644 100644 --- a/lnrpc/autopilotrpc/autopilot_server.go +++ b/lnrpc/autopilotrpc/autopilot_server.go @@ -1,3 +1,4 @@ +//go:build autopilotrpc // +build autopilotrpc package autopilotrpc diff --git a/lnrpc/autopilotrpc/config_active.go b/lnrpc/autopilotrpc/config_active.go index 93aca4f23..a80581b41 100644 --- a/lnrpc/autopilotrpc/config_active.go +++ b/lnrpc/autopilotrpc/config_active.go @@ -1,3 +1,4 @@ +//go:build autopilotrpc // +build autopilotrpc package autopilotrpc diff --git a/lnrpc/autopilotrpc/config_default.go b/lnrpc/autopilotrpc/config_default.go index 2d42ab515..efe532cdf 100644 --- a/lnrpc/autopilotrpc/config_default.go +++ b/lnrpc/autopilotrpc/config_default.go @@ -1,3 +1,4 @@ +//go:build !autopilotrpc // +build !autopilotrpc package autopilotrpc diff --git a/lnrpc/autopilotrpc/driver.go b/lnrpc/autopilotrpc/driver.go index 8f849c3e6..c62ecc1b4 100644 --- a/lnrpc/autopilotrpc/driver.go +++ b/lnrpc/autopilotrpc/driver.go @@ -1,3 +1,4 @@ +//go:build autopilotrpc // +build autopilotrpc package autopilotrpc diff --git a/lnrpc/chainrpc/chainnotifier_server.go b/lnrpc/chainrpc/chainnotifier_server.go index 4f3f5d1ca..56f6fb8f7 100644 --- a/lnrpc/chainrpc/chainnotifier_server.go +++ b/lnrpc/chainrpc/chainnotifier_server.go @@ -1,3 +1,4 @@ +//go:build chainrpc // +build chainrpc package chainrpc diff --git a/lnrpc/chainrpc/config_active.go b/lnrpc/chainrpc/config_active.go index 0cc3a53da..636798c72 100644 --- a/lnrpc/chainrpc/config_active.go +++ b/lnrpc/chainrpc/config_active.go @@ -1,3 +1,4 @@ +//go:build chainrpc // +build chainrpc package chainrpc diff --git a/lnrpc/chainrpc/config_default.go b/lnrpc/chainrpc/config_default.go index 53bb97a14..678eb68b9 100644 --- a/lnrpc/chainrpc/config_default.go +++ b/lnrpc/chainrpc/config_default.go @@ -1,3 +1,4 @@ +//go:build !chainrpc // +build !chainrpc package chainrpc diff --git a/lnrpc/chainrpc/driver.go b/lnrpc/chainrpc/driver.go index be307f82d..c25ffbff4 100644 --- a/lnrpc/chainrpc/driver.go +++ b/lnrpc/chainrpc/driver.go @@ -1,3 +1,4 @@ +//go:build chainrpc // +build chainrpc package chainrpc diff --git a/lnrpc/invoicesrpc/config_active.go b/lnrpc/invoicesrpc/config_active.go index 3246f4b7f..01f595abc 100644 --- a/lnrpc/invoicesrpc/config_active.go +++ b/lnrpc/invoicesrpc/config_active.go @@ -1,3 +1,4 @@ +//go:build invoicesrpc // +build invoicesrpc package invoicesrpc diff --git a/lnrpc/invoicesrpc/config_default.go b/lnrpc/invoicesrpc/config_default.go index bb40c4809..fad6aacb3 100644 --- a/lnrpc/invoicesrpc/config_default.go +++ b/lnrpc/invoicesrpc/config_default.go @@ -1,3 +1,4 @@ +//go:build !invoicesrpc // +build !invoicesrpc package invoicesrpc diff --git a/lnrpc/invoicesrpc/driver.go b/lnrpc/invoicesrpc/driver.go index 5183c878c..8014528ea 100644 --- a/lnrpc/invoicesrpc/driver.go +++ b/lnrpc/invoicesrpc/driver.go @@ -1,3 +1,4 @@ +//go:build invoicesrpc // +build invoicesrpc package invoicesrpc diff --git a/lnrpc/invoicesrpc/invoices_server.go b/lnrpc/invoicesrpc/invoices_server.go index 947867afc..4cd2758a8 100644 --- a/lnrpc/invoicesrpc/invoices_server.go +++ b/lnrpc/invoicesrpc/invoices_server.go @@ -1,3 +1,4 @@ +//go:build invoicesrpc // +build invoicesrpc package invoicesrpc diff --git a/lnrpc/signrpc/config_active.go b/lnrpc/signrpc/config_active.go index c5ce25a9d..b2db16960 100644 --- a/lnrpc/signrpc/config_active.go +++ b/lnrpc/signrpc/config_active.go @@ -1,3 +1,4 @@ +//go:build signrpc // +build signrpc package signrpc diff --git a/lnrpc/signrpc/config_default.go b/lnrpc/signrpc/config_default.go index 7698f19fb..743e41471 100644 --- a/lnrpc/signrpc/config_default.go +++ b/lnrpc/signrpc/config_default.go @@ -1,3 +1,4 @@ +//go:build !signrpc // +build !signrpc package signrpc diff --git a/lnrpc/signrpc/driver.go b/lnrpc/signrpc/driver.go index cd130d5ee..e000c5635 100644 --- a/lnrpc/signrpc/driver.go +++ b/lnrpc/signrpc/driver.go @@ -1,3 +1,4 @@ +//go:build signrpc // +build signrpc package signrpc diff --git a/lnrpc/signrpc/signer_server.go b/lnrpc/signrpc/signer_server.go index 2eefdd48e..a7da514b6 100644 --- a/lnrpc/signrpc/signer_server.go +++ b/lnrpc/signrpc/signer_server.go @@ -1,3 +1,4 @@ +//go:build signrpc // +build signrpc package signrpc diff --git a/lnrpc/walletrpc/config_active.go b/lnrpc/walletrpc/config_active.go index 891553fd8..806dbca48 100644 --- a/lnrpc/walletrpc/config_active.go +++ b/lnrpc/walletrpc/config_active.go @@ -1,3 +1,4 @@ +//go:build walletrpc // +build walletrpc package walletrpc diff --git a/lnrpc/walletrpc/config_default.go b/lnrpc/walletrpc/config_default.go index 9439ef840..2a423522a 100644 --- a/lnrpc/walletrpc/config_default.go +++ b/lnrpc/walletrpc/config_default.go @@ -1,3 +1,4 @@ +//go:build !walletrpc // +build !walletrpc package walletrpc diff --git a/lnrpc/walletrpc/driver.go b/lnrpc/walletrpc/driver.go index d8547d8c0..79972f7db 100644 --- a/lnrpc/walletrpc/driver.go +++ b/lnrpc/walletrpc/driver.go @@ -1,3 +1,4 @@ +//go:build walletrpc // +build walletrpc package walletrpc diff --git a/lnrpc/walletrpc/psbt.go b/lnrpc/walletrpc/psbt.go index 736b0402c..40deedd08 100644 --- a/lnrpc/walletrpc/psbt.go +++ b/lnrpc/walletrpc/psbt.go @@ -1,3 +1,4 @@ +//go:build walletrpc // +build walletrpc package walletrpc diff --git a/lnrpc/walletrpc/walletkit_server.go b/lnrpc/walletrpc/walletkit_server.go index 487f2ab4e..80a5b8e4a 100644 --- a/lnrpc/walletrpc/walletkit_server.go +++ b/lnrpc/walletrpc/walletkit_server.go @@ -1,3 +1,4 @@ +//go:build walletrpc // +build walletrpc package walletrpc diff --git a/lnrpc/watchtowerrpc/config_active.go b/lnrpc/watchtowerrpc/config_active.go index 223816263..5d8ded7a9 100644 --- a/lnrpc/watchtowerrpc/config_active.go +++ b/lnrpc/watchtowerrpc/config_active.go @@ -1,3 +1,4 @@ +//go:build watchtowerrpc // +build watchtowerrpc package watchtowerrpc diff --git a/lnrpc/watchtowerrpc/config_default.go b/lnrpc/watchtowerrpc/config_default.go index ac40e0bf1..d7d50bf4a 100644 --- a/lnrpc/watchtowerrpc/config_default.go +++ b/lnrpc/watchtowerrpc/config_default.go @@ -1,3 +1,4 @@ +//go:build !watchtowerrpc // +build !watchtowerrpc package watchtowerrpc diff --git a/lnrpc/watchtowerrpc/driver.go b/lnrpc/watchtowerrpc/driver.go index 3fa5f1d2c..6352de7cc 100644 --- a/lnrpc/watchtowerrpc/driver.go +++ b/lnrpc/watchtowerrpc/driver.go @@ -1,3 +1,4 @@ +//go:build watchtowerrpc // +build watchtowerrpc package watchtowerrpc diff --git a/lnrpc/watchtowerrpc/handler.go b/lnrpc/watchtowerrpc/handler.go index a9b602160..4aacea1be 100644 --- a/lnrpc/watchtowerrpc/handler.go +++ b/lnrpc/watchtowerrpc/handler.go @@ -1,3 +1,4 @@ +//go:build watchtowerrpc // +build watchtowerrpc package watchtowerrpc diff --git a/lntest/bitcoind.go b/lntest/bitcoind.go index e730b707d..37ff5fb5d 100644 --- a/lntest/bitcoind.go +++ b/lntest/bitcoind.go @@ -1,5 +1,5 @@ -// +build bitcoind -// +build !notxindex +//go:build bitcoind && !notxindex +// +build bitcoind,!notxindex package lntest diff --git a/lntest/bitcoind_common.go b/lntest/bitcoind_common.go index 586c927dd..9fc03756b 100644 --- a/lntest/bitcoind_common.go +++ b/lntest/bitcoind_common.go @@ -1,3 +1,4 @@ +//go:build bitcoind // +build bitcoind package lntest diff --git a/lntest/bitcoind_notxindex.go b/lntest/bitcoind_notxindex.go index 1d565d8c7..2aa7e4a63 100644 --- a/lntest/bitcoind_notxindex.go +++ b/lntest/bitcoind_notxindex.go @@ -1,5 +1,5 @@ -// +build bitcoind -// +build notxindex +//go:build bitcoind && notxindex +// +build bitcoind,notxindex package lntest diff --git a/lntest/btcd.go b/lntest/btcd.go index 18ad01bbe..fd8cacf72 100644 --- a/lntest/btcd.go +++ b/lntest/btcd.go @@ -1,3 +1,4 @@ +//go:build !bitcoind && !neutrino // +build !bitcoind,!neutrino package lntest diff --git a/lntest/itest/lnd_etcd_failover_test.go b/lntest/itest/lnd_etcd_failover_test.go index 14c15ab97..9d6caceb7 100644 --- a/lntest/itest/lnd_etcd_failover_test.go +++ b/lntest/itest/lnd_etcd_failover_test.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd // +build kvdb_etcd package itest diff --git a/lntest/itest/lnd_max_channel_size_test.go b/lntest/itest/lnd_max_channel_size_test.go index f26126393..940e5f21b 100644 --- a/lntest/itest/lnd_max_channel_size_test.go +++ b/lntest/itest/lnd_max_channel_size_test.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package itest diff --git a/lntest/itest/lnd_no_etcd_dummy_failover_test.go b/lntest/itest/lnd_no_etcd_dummy_failover_test.go index 25eb32141..c2a9a188b 100644 --- a/lntest/itest/lnd_no_etcd_dummy_failover_test.go +++ b/lntest/itest/lnd_no_etcd_dummy_failover_test.go @@ -1,3 +1,4 @@ +//go:build !kvdb_etcd // +build !kvdb_etcd package itest diff --git a/lntest/itest/lnd_test_list_off_test.go b/lntest/itest/lnd_test_list_off_test.go index 59795f1d1..bf21584f3 100644 --- a/lntest/itest/lnd_test_list_off_test.go +++ b/lntest/itest/lnd_test_list_off_test.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package itest diff --git a/lntest/itest/lnd_test_list_on_test.go b/lntest/itest/lnd_test_list_on_test.go index a3acbcaf8..df266cdc9 100644 --- a/lntest/itest/lnd_test_list_on_test.go +++ b/lntest/itest/lnd_test_list_on_test.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package itest diff --git a/lntest/neutrino.go b/lntest/neutrino.go index f16b3e15e..6c8f7098a 100644 --- a/lntest/neutrino.go +++ b/lntest/neutrino.go @@ -1,3 +1,4 @@ +//go:build neutrino // +build neutrino package lntest diff --git a/lntest/timeouts.go b/lntest/timeouts.go index d4ca9555e..6723050b2 100644 --- a/lntest/timeouts.go +++ b/lntest/timeouts.go @@ -1,3 +1,4 @@ +//go:build !darwin && !kvdb_etcd && !kvdb_postgres // +build !darwin,!kvdb_etcd,!kvdb_postgres package lntest diff --git a/lntest/timeouts_darwin.go b/lntest/timeouts_darwin.go index 1382bc2fd..b07559b39 100644 --- a/lntest/timeouts_darwin.go +++ b/lntest/timeouts_darwin.go @@ -1,3 +1,4 @@ +//go:build darwin && !kvdb_etcd && !kvdb_postgres // +build darwin,!kvdb_etcd,!kvdb_postgres package lntest diff --git a/lntest/timeouts_remote_db.go b/lntest/timeouts_remote_db.go index c0c16cbc3..a9d6977d0 100644 --- a/lntest/timeouts_remote_db.go +++ b/lntest/timeouts_remote_db.go @@ -1,3 +1,4 @@ +//go:build kvdb_etcd || kvdb_postgres // +build kvdb_etcd kvdb_postgres package lntest diff --git a/lnwallet/btcwallet/btcwallet_rpctest.go b/lnwallet/btcwallet/btcwallet_rpctest.go index 28dd35a72..938aef303 100644 --- a/lnwallet/btcwallet/btcwallet_rpctest.go +++ b/lnwallet/btcwallet/btcwallet_rpctest.go @@ -1,3 +1,4 @@ +//go:build rpctest || lowscrypt // +build rpctest lowscrypt package btcwallet diff --git a/lnwallet/revocation_producer.go b/lnwallet/revocation_producer.go index 6f8c56c55..fc8bde0fa 100644 --- a/lnwallet/revocation_producer.go +++ b/lnwallet/revocation_producer.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package lnwallet diff --git a/lnwallet/revocation_producer_itest.go b/lnwallet/revocation_producer_itest.go index 6ef89119b..853a87760 100644 --- a/lnwallet/revocation_producer_itest.go +++ b/lnwallet/revocation_producer_itest.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package lnwallet diff --git a/macaroons/security.go b/macaroons/security.go index 814b0d256..cdc409b34 100644 --- a/macaroons/security.go +++ b/macaroons/security.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package macaroons diff --git a/macaroons/security_rpctest.go b/macaroons/security_rpctest.go index d49819e0f..83792c383 100644 --- a/macaroons/security_rpctest.go +++ b/macaroons/security_rpctest.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package macaroons diff --git a/mobile/bindings.go b/mobile/bindings.go index 58cf2a0e9..ca841d793 100644 --- a/mobile/bindings.go +++ b/mobile/bindings.go @@ -1,3 +1,4 @@ +//go:build mobile // +build mobile package lndmobile diff --git a/monitoring/monitoring_off.go b/monitoring/monitoring_off.go index f3a792190..8e2a1c2be 100644 --- a/monitoring/monitoring_off.go +++ b/monitoring/monitoring_off.go @@ -1,3 +1,4 @@ +//go:build !monitoring // +build !monitoring package monitoring diff --git a/monitoring/monitoring_on.go b/monitoring/monitoring_on.go index 8f10bec4d..78a0f7e22 100644 --- a/monitoring/monitoring_on.go +++ b/monitoring/monitoring_on.go @@ -1,3 +1,4 @@ +//go:build monitoring // +build monitoring package monitoring diff --git a/server_test.go b/server_test.go index 7bcecbc06..48b2f652d 100644 --- a/server_test.go +++ b/server_test.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package lnd diff --git a/sweep/defaults.go b/sweep/defaults.go index d9b5c9231..def74a3a2 100644 --- a/sweep/defaults.go +++ b/sweep/defaults.go @@ -1,3 +1,4 @@ +//go:build !rpctest // +build !rpctest package sweep diff --git a/sweep/defaults_rpctest.go b/sweep/defaults_rpctest.go index 0d185e743..24789de09 100644 --- a/sweep/defaults_rpctest.go +++ b/sweep/defaults_rpctest.go @@ -1,3 +1,4 @@ +//go:build rpctest // +build rpctest package sweep diff --git a/tools.go b/tools.go index d3ff69b03..fad50c7e7 100644 --- a/tools.go +++ b/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools package lnd From d6fc6f4960d92c9876723e2e054ee32c44ad7e8c Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 25 Aug 2021 15:47:26 -0700 Subject: [PATCH 4/7] docs: advertise Go 1.16 as min Go version in INSTALL.md --- docs/INSTALL.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 6e1241cdd..4c732ac9d 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -93,46 +93,46 @@ version if there are database migrations present. * **Go:** `lnd` is written in Go. To install, run one of the following commands: - **Note**: The minimum version of Go supported is Go 1.15. We recommend that + **Note**: The minimum version of Go supported is Go 1.16. We recommend that users use the latest version of Go, which at the time of writing is - [`1.16`](https://blog.golang.org/go1.16). + [`1.17.1`](https://blog.golang.org/go1.17.1). On Linux: (x86-64) ``` - wget https://dl.google.com/go/go1.16.linux-amd64.tar.gz - sha256sum go1.16.linux-amd64.tar.gz | awk -F " " '{ print $1 }' + wget https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz + sha256sum go1.17.1.linux-amd64.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2`. If it + `dab7d9c34361dc21ec237d584590d72500652e7c909bf082758fb63064fca0ef`. If it isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install this version of Go. If it matches, then proceed to install Go: ``` - sudo tar -C /usr/local -xzf go1.16.linux-amd64.tar.gz + sudo tar -C /usr/local -xzf go1.17.1.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin ``` (ARMv6) ``` - wget https://dl.google.com/go/go1.16.linux-armv6l.tar.gz - sha256sum go1.16.linux-armv6l.tar.gz | awk -F " " '{ print $1 }' + wget https://dl.google.com/go/go1.17.1.linux-armv6l.tar.gz + sha256sum go1.17.1.linux-armv6l.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd`. If it + `ed3e4dbc9b80353f6482c441d65b51808290e94ff1d15d56da5f4a7be7353758`. If it isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install this version of Go. If it matches, then proceed to install Go: ``` - tar -C /usr/local -xzf go1.16.linux-armv6l.tar.gz + tar -C /usr/local -xzf go1.17.1.linux-armv6l.tar.gz export PATH=$PATH:/usr/local/go/bin ``` On Mac OS X: ``` - brew install go@1.16 + brew install go@1.17.1 ``` On FreeBSD: From 9b9e1d329ae12e0991061beaf7aa4cbd29ed6c65 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 25 Aug 2021 15:47:56 -0700 Subject: [PATCH 5/7] docs/release-notes: add new entry for bump to Go 1.17 --- docs/release-notes/release-notes-0.14.0.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/release-notes/release-notes-0.14.0.md b/docs/release-notes/release-notes-0.14.0.md index ee748ec1a..1c0023d83 100644 --- a/docs/release-notes/release-notes-0.14.0.md +++ b/docs/release-notes/release-notes-0.14.0.md @@ -198,6 +198,10 @@ you. * [Fix Travis itest parallelism](https://github.com/lightningnetwork/lnd/pull/5734) +* [All CI, containers, and automated release artifact building now all use Go + 1.17.1](https://github.com/lightningnetwork/lnd/pull/5650). All build tags have + been updated accordingly to comply with the new Go 1.17.1 requirements. + ## Documentation * [Outdated warning about unsupported pruning was replaced with clarification that LND **does** From 6b73f01683aaff807aece62d22fcb7b7f02ae9ed Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 25 Aug 2021 15:56:57 -0700 Subject: [PATCH 6/7] build: set min Go version to 1.16 in go.mod --- .github/pull_request_template.md | 2 +- go.mod | 3 +-- go.sum | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 210e0ef30..ce22a9a12 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ #### Pull Request Checklist -- [ ] All changes are Go version 1.15 compliant +- [ ] All changes are Go version 1.16 compliant - [ ] Your PR passes all CI checks. If a check cannot be passed for a justifiable reason, that reason must be stated in the commit message and PR description. - [ ] If this is your first time contributing, we recommend you read the [Code Contribution Guidelines](https://github.com/lightningnetwork/lnd/blob/master/docs/code_contribution_guidelines.md) - [ ] The code being submitted is commented according to [Code Documentation and Commenting](https://github.com/lightningnetwork/lnd/blob/master/docs/code_contribution_guidelines.md#CodeDocumentation) diff --git a/go.mod b/go.mod index 2b249a91d..3396c9893 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/btcsuite/btcwallet/wtxmgr v1.3.1-0.20210822222949-9b5a201c344c github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/davecgh/go-spew v1.1.1 - github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-errors/errors v1.0.1 github.com/go-openapi/strfmt v0.19.5 // indirect github.com/golang/protobuf v1.5.2 @@ -90,4 +89,4 @@ replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompat // If you change this please also update .github/pull_request_template.md and // docs/INSTALL.md. -go 1.15 +go 1.16 diff --git a/go.sum b/go.sum index 583a3757b..238636581 100644 --- a/go.sum +++ b/go.sum @@ -184,8 +184,6 @@ github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD github.com/frankban/quicktest v1.2.2 h1:xfmOhhoH5fGPgbEAlhLpJH9p0z/0Qizio9osmvn9IUY= github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -714,7 +712,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -800,7 +797,6 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 6ae6f8026bc01a9c31d133a5da28ad230f95e2e2 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 25 Aug 2021 16:04:30 -0700 Subject: [PATCH 7/7] build: retract v0.0.2 A stray version of lnd was pushed out waaaay back in 2016 that can trip up `pkg.go.dev` and things like `go get`. Using the new Go 1.16 feature, we can now "retract" this version, which marks it as being unavailable. --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index 3396c9893..ab914fb56 100644 --- a/go.mod +++ b/go.mod @@ -90,3 +90,5 @@ replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompat // If you change this please also update .github/pull_request_template.md and // docs/INSTALL.md. go 1.16 + +retract v0.0.2