Merge pull request #403 from guggero/docker-rpc

looprpc: generate protos with docker

Author: guggero

Makefile

@@ -74,5 +74,9 @@ install:
 	$(GOINSTALL) -tags="${tags}" $(LDFLAGS) $(PKG)/cmd/loopd
 
 rpc:
-	@$(call print, "Compiling RPC protos.")
-	cd looprpc; ./gen_protos.sh
+	@$(call print, "Compiling protos.")
+	cd ./looprpc; ./gen_protos_docker.sh
+
+rpc-check: rpc
+	@$(call print, "Verifying protos.")
+	if test -n "$$(git describe --dirty | grep dirty)"; then echo "Protos not properly formatted or not compiled with correct version!"; git status; git diff; exit 1; fi

cmd/loop/loopout.go

@@ -203,8 +203,8 @@ func loopOut(ctx *cli.Context) error {
 	}
 
 	fmt.Printf("Swap initiated\n")
-	fmt.Printf("ID:             %v\n", resp.Id)
-	fmt.Printf("HTLC address:   %v\n", resp.HtlcAddress)
+	fmt.Printf("ID:             %x\n", resp.IdBytes)
+	fmt.Printf("HTLC address:   %v\n", resp.HtlcAddress) // nolint:staticcheck
 	if resp.ServerMessage != "" {
 		fmt.Printf("Server message: %v\n", resp.ServerMessage)
 	}

go.mod

@@ -21,8 +21,8 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.20.0
 	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
-	google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c
 	google.golang.org/grpc v1.29.1
+	google.golang.org/protobuf v1.23.0
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.1.0
 )

loopd/swapclient_server.go

@@ -121,12 +121,12 @@ func (s *swapClientServer) LoopOut(ctx context.Context,
 	}
 
 	switch {
-	case in.LoopOutChannel != 0 && len(in.OutgoingChanSet) > 0:
+	case in.LoopOutChannel != 0 && len(in.OutgoingChanSet) > 0: // nolint:staticcheck
 		return nil, errors.New("loop_out_channel and outgoing_" +
 			"chan_ids are mutually exclusive")
 
-	case in.LoopOutChannel != 0:
-		req.OutgoingChanSet = loopdb.ChannelSet{in.LoopOutChannel}
+	case in.LoopOutChannel != 0: // nolint:staticcheck
+		req.OutgoingChanSet = loopdb.ChannelSet{in.LoopOutChannel} // nolint:staticcheck
 
 	default:
 		req.OutgoingChanSet = in.OutgoingChanSet
@@ -540,9 +540,9 @@ func (s *swapClientServer) LoopIn(ctx context.Context,
 
 	if req.ExternalHtlc {
 		response.HtlcAddressNp2Wsh = swapInfo.HtlcAddressNP2WSH.String()
-		response.HtlcAddress = response.HtlcAddressNp2Wsh
+		response.HtlcAddress = response.HtlcAddressNp2Wsh // nolint:staticcheck
 	} else {
-		response.HtlcAddress = response.HtlcAddressP2Wsh
+		response.HtlcAddress = response.HtlcAddressP2Wsh // nolint:staticcheck
 	}
 
 	return response, nil

looprpc/.clang-format

@@ -0,0 +1,7 @@
+---
+Language: Proto
+BasedOnStyle: Google
+IndentWidth: 4
+AllowShortFunctionsOnASingleLine: None
+SpaceBeforeParens: Always
+CompactNamespaces: false

looprpc/Dockerfile

@@ -0,0 +1,22 @@
+FROM golang:1.15.6-buster
+
+RUN apt-get update && apt-get install -y \
+  git \
+  protobuf-compiler='3.6*' \
+  clang-format='1:7.0*'
+
+# We don't want any default values for these variables to make sure they're
+# explicitly provided by parsing the go.mod file. Otherwise we might forget to
+# update them here if we bump the versions.
+ARG PROTOC_GEN_VERSION
+ARG GRPC_GATEWAY_VERSION
+
+RUN cd /tmp \
+  && export GO111MODULE=on \
+  && go get github.com/golang/protobuf/protoc-gen-go@${PROTOC_GEN_VERSION} \
+  && go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} \
+  && go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@${GRPC_GATEWAY_VERSION}
+
+WORKDIR /build
+
+CMD ["/bin/bash", "/build/looprpc/gen_protos.sh"]