lnrpc: update github.com/golang/protobuf to v1.2.0

Update is necessary to get protoc to generate files in the right
directory when using modules outside the gopath. The old version of this
dependency did not support paths=source_relative.

This commit also fixes a build error in lnd_test.go because of a
slight difference in generated code.
This commit is contained in:
Joost Jager 2018-12-18 13:49:57 +01:00
parent 6ca52c4ec7
commit 9e611636ee
No known key found for this signature in database
GPG Key ID: AE6B0D042C8E38D9
2 changed files with 4 additions and 4 deletions

@ -12194,7 +12194,7 @@ func testRouteFeeCutoff(net *lntest.NetworkHarness, t *harnessTest) {
// route using Carol as an intermediate hop is 10% of the payment's
// amount, we'll use a lower percentage in order to invalid that route.
feeLimitPercent := &lnrpc.FeeLimit{
&lnrpc.FeeLimit_Percent{baseFee/1000 - 1},
Limit: &lnrpc.FeeLimit_Percent{baseFee/1000 - 1},
}
testFeeCutoff(feeLimitPercent)
@ -12202,7 +12202,7 @@ func testRouteFeeCutoff(net *lntest.NetworkHarness, t *harnessTest) {
// fee for the route using Carol as an intermediate hop earlier, we can
// use a smaller value in order to invalidate that route.
feeLimitFixed := &lnrpc.FeeLimit{
&lnrpc.FeeLimit_Fixed{int64(carolFee.ToSatoshis()) - 1},
Limit: &lnrpc.FeeLimit_Fixed{int64(carolFee.ToSatoshis()) - 1},
}
testFeeCutoff(feeLimitFixed)

@ -149,11 +149,11 @@ $ unzip protoc-3.4.0-osx-x86_64.zip -d protoc
$ export PATH=$PWD/protoc/bin:$PATH
```
2. Install `golang/protobuf` at commit `bbd03ef6da3a115852eaf24c8a1c46aeb39aa175`.
2. Install `golang/protobuf` at commit `aa810b61a9c79d51363740d207bb46cf8e620ed5` (v1.2.0).
```bash
$ git clone https://github.com/golang/protobuf $GOPATH/src/github.com/golang/protobuf
$ cd $GOPATH/src/github.com/golang/protobuf
$ git reset --hard bbd03ef6da3a115852eaf24c8a1c46aeb39aa175
$ git reset --hard aa810b61a9c79d51363740d207bb46cf8e620ed5
$ make
```