Skip to content

Commit 929a565

Browse files
authored
Merge pull request lightningnetwork#6356 from guggero/remove-healthcheck-replace
go module cleanup [3/3]: remove local replace for healthcheck module
2 parents db4831a + 58a4784 commit 929a565

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

docs/release-notes/release-notes-0.15.0.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,11 @@
8686
* [The `tlv` package was refactored into its own Golang
8787
submodule](https://github.com/lightningnetwork/lnd/pull/6283).
8888

89-
* [The `tor` package was refactored into its own Golang
90-
submodule](https://github.com/lightningnetwork/lnd/pull/6350).
89+
* The `tor` package was refactored into its own Golang submodule and a new
90+
process for changing and tagging submodules was introduced in a series of
91+
3 PRs ([#6350](https://github.com/lightningnetwork/lnd/pull/6350),
92+
[#6355](https://github.com/lightningnetwork/lnd/pull/6350) and
93+
[#6356](https://github.com/lightningnetwork/lnd/pull/6356)).
9194

9295
* [Source repository can now be specified for Docker image builds](https://github.com/lightningnetwork/lnd/pull/6300)
9396

go.mod

-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ require (
6565
gopkg.in/macaroon.v2 v2.0.0
6666
)
6767

68-
// TODO(guggero): Remove these after merging #6350 and pushing the new tag!
69-
replace github.com/lightningnetwork/lnd/healthcheck => ./healthcheck
70-
7168
// This replace is for https://github.com/advisories/GHSA-w73w-5m7g-f7qc
7269
replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompatible
7370

go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,9 @@ github.com/lightningnetwork/lnd/cert v1.1.1/go.mod h1:1P46svkkd73oSoeI4zjkVKgZNw
467467
github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg=
468468
github.com/lightningnetwork/lnd/clock v1.1.0 h1:/yfVAwtPmdx45aQBoXQImeY7sOIEr7IXlImRMBOZ7GQ=
469469
github.com/lightningnetwork/lnd/clock v1.1.0/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg=
470+
github.com/lightningnetwork/lnd/healthcheck v1.0.0/go.mod h1:u92p1JGFJNMSkMvztKEwmt1P3TRnLeJBXZ3M85xkU1E=
471+
github.com/lightningnetwork/lnd/healthcheck v1.2.2 h1:im+qcpgSuteqRCGeorT9yqVXuLrS6A7/acYzGgarMS4=
472+
github.com/lightningnetwork/lnd/healthcheck v1.2.2/go.mod h1:IWY0GChlarRbXFkFDdE4WY5POYJabe/7/H1iCZt4ZKs=
470473
github.com/lightningnetwork/lnd/kvdb v1.3.1 h1:gEz3zudNNRrCLEvqRaktYoKwsUblyHX+MKjR0aI3QnM=
471474
github.com/lightningnetwork/lnd/kvdb v1.3.1/go.mod h1:x+IpsuDynubjokUofavLXroeGfS/WrqUXXTK6vN/gp4=
472475
github.com/lightningnetwork/lnd/queue v1.0.1/go.mod h1:vaQwexir73flPW43Mrm7JOgJHmcEFBWWSl9HlyASoms=
@@ -888,6 +891,7 @@ golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7w
888891
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
889892
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
890893
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
894+
golang.org/x/sys v0.0.0-20210426080607-c94f62235c83/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
891895
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
892896
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
893897
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

0 commit comments

Comments
 (0)