swapserverrpc: add module for server protos #445
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
carlaKC
force-pushed
the
module-swapserverrpc
branch
from
3f4ba51 to
f3927bb
Compare
carlaKC
force-pushed
the
module-swapserverrpc
branch
4 times, most recently
from
1e6ed74 to
17b8277
Compare
bhandras
approved these changes
Dec 13, 2021
go.mod
Outdated
| @@ -11,6 +11,7 @@ require ( | |||
| github.com/jessevdk/go-flags v1.4.0 | |||
| github.com/lightninglabs/aperture v0.1.6-beta | |||
| github.com/lightninglabs/lndclient v0.14.0-5 | |||
| github.com/lightninglabs/loop/swapserverrpc v0.0.0-00010101000000-000000000000 | |||
There was a problem hiding this comment.
This could use a future tag (e.g. v1.0.0) we add when the PR is merged right?
There was a problem hiding this comment.
Yes, if go mod somehow allows it, I'd point this to a tag that doesn't exist yet so we can just create and push it once the PR is merged.
There was a problem hiding this comment.
TIL you can do that!
guggero
approved these changes
Dec 13, 2021
go.mod
Outdated
| @@ -11,6 +11,7 @@ require ( | |||
| github.com/jessevdk/go-flags v1.4.0 | |||
| github.com/lightninglabs/aperture v0.1.6-beta | |||
| github.com/lightninglabs/lndclient v0.14.0-5 | |||
| github.com/lightninglabs/loop/swapserverrpc v0.0.0-00010101000000-000000000000 | |||
There was a problem hiding this comment.
Yes, if go mod somehow allows it, I'd point this to a tag that doesn't exist yet so we can just create and push it once the PR is merged.
Protobuf does not allow naming conflicts for files within the same process, because all proto messages register themselves in a global registry. This is problematic because the server's itests import the client's looprpc package to make rpc queries to the loopd client, thus importing duplicate common.proto and server.proto from the client's looprc package (since they're both in there as well). This change moves the server's proto files into their own directory so that they are not imported when we want to use the client's files. We cannot change the package name for the server, because that would be a breaking change (the package name is included in URIS). Fortunately, we have the go_package option which allows us to place generated files in a different location.
To make it possible to replace the swapserverrpc module in the server, we declare it as its own submodule. This allows the server to make changes to its local protos (and replace loop's copy with the local version), to use changes that are not yet merged to the client repo.
carlaKC
force-pushed
the
module-swapserverrpc
branch
from
17b8277 to
a9e7748
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Checklist
release_notes.mdif your PR contains major features, breaking changes or bugfixes