Merge pull request lightninglabs#325 from guggero/fix-aperture-version

multi: bump lnd, aperture and pool versions

Makefile

@@ -33,6 +33,7 @@ RM := rm -f
 CP := cp
 MAKE := make
 XARGS := xargs -L 1
+UNAME_S := $(shell uname -s)
 
 include make/testing_flags.mk
 
@@ -122,6 +123,12 @@ itest: build-itest itest-only
 
 itest-only:
 	@$(call print, "Running integration tests with ${backend} backend.")
+ifeq ($(UNAME_S),Linux)
+	mkdir -p $$HOME/.aperture
+endif
+ifeq ($(UNAME_S),Darwin)
+	mkdir -p "$$HOME/Library/Application Support/Aperture"
+endif
 	rm -rf itest/regtest; date
 	$(GOTEST) ./itest -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput -goroutinedump -btcdexec=./btcd-itest -logdir=regtest
 

go.mod

@@ -4,37 +4,34 @@ require (
 	github.com/btcsuite/btcd v0.21.0-beta.0.20210513141527-ee5896bad5be
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/btcsuite/btcutil v1.0.3-0.20210527170813-e2ba6805a890
-	github.com/btcsuite/btcwallet/wtxmgr v1.3.0
+	github.com/btcsuite/btcwallet/wtxmgr v1.3.1-0.20210706234807-aaf03fee735a
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-errors/errors v1.0.1
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/grpc-ecosystem/grpc-gateway v1.14.6
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/aperture v0.1.7-beta.0.20210628133219-bb85fbe5e0a6
-	github.com/lightninglabs/lndclient v0.12.0-8
-	github.com/lightninglabs/pool v0.5.0-alpha.0.20210625223549-5e2579001bf5
-	github.com/lightninglabs/pool/auctioneerrpc v1.0.2
+	github.com/lightninglabs/aperture v0.1.9-beta.0.20210730071214-beed396b0ef6
+	github.com/lightninglabs/lndclient v0.12.0-9
+	github.com/lightninglabs/pool v0.5.1-alpha
+	github.com/lightninglabs/pool/auctioneerrpc v1.0.3
 	github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
-	github.com/lightningnetwork/lnd v0.13.0-beta
+	github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210728112744-ebabda671786
 	github.com/lightningnetwork/lnd/cert v1.0.3
 	github.com/lightningnetwork/lnd/ticker v1.0.0
-	github.com/prometheus/client_golang v1.5.1
+	github.com/prometheus/client_golang v1.11.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.20.0
-	go.etcd.io/etcd v3.4.14+incompatible
-	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
-	google.golang.org/grpc v1.29.1
-	google.golang.org/protobuf v1.25.0
+	go.etcd.io/etcd/client/v3 v3.5.0
+	go.etcd.io/etcd/server/v3 v3.5.0
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
+	google.golang.org/grpc v1.38.0
+	google.golang.org/protobuf v1.26.0
 	gopkg.in/macaroon.v2 v2.1.0
 )
 
 go 1.13
 
-// Fix incompatibility of etcd go.mod package.
-// See https://github.com/etcd-io/etcd/issues/11154
-replace go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200520232829-54ba9589114f
-
 // The subasta/auctioneerrpc package declares itself as pool/auctioneerrpc as
 // well so go mod can identify it as the same package and allows us to replace
 // it in the client binary as well. We need to import it with its declared name

itest/account_test.go

@@ -270,12 +270,9 @@ func testAccountDeposit(t *harnessTest) {
 	// We'll then attempt a deposit using a NP2WKH input. To do so, we'll
 	// need a NP2WKH available to spend. We send over 4 BTC and will attempt
 	// a 3 BTC deposit to ensure the NP2WKH input is chosen.
-	err = t.lndHarness.SendCoinsNP2WKH(
-		ctx, btcutil.SatoshiPerBitcoin*4, t.trader.cfg.LndNode,
+	t.lndHarness.SendCoinsNP2WKH(
+		ctx, t.t, btcutil.SatoshiPerBitcoin*4, t.trader.cfg.LndNode,
 	)
-	if err != nil {
-		t.Fatalf("unable to send np2wkh coins: %v", err)
-	}
 	depositReq.AmountSat = btcutil.SatoshiPerBitcoin * 3
 	valueAfterSecondDeposit := btcutil.Amount(
 		depositResp.Account.Value + depositReq.AmountSat,
@@ -356,6 +353,12 @@ func testAccountRenewal(t *harnessTest) {
 	require.NoError(t.t, err)
 	absoluteExpiry := uint32(bestHeight) + newRelativeExpiry
 
+	// Wait for the lnd backend to catch up as well.
+	ctxt, cancel := context.WithTimeout(ctx, defaultTimeout)
+	defer cancel()
+	err = t.lndHarness.Bob.WaitForBlockchainSync(ctxt)
+	require.NoError(t.t, err)
+
 	updateReq := &poolrpc.RenewAccountRequest{
 		AccountKey: account.TraderKey,
 		AccountExpiry: &poolrpc.RenewAccountRequest_RelativeExpiry{

itest/auctioneer_harness.go

@@ -24,7 +24,7 @@ import (
 	"github.com/lightningnetwork/lnd/lntest"
 	"github.com/lightningnetwork/lnd/lntest/wait"
 	"github.com/lightningnetwork/lnd/macaroons"
-	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/server/v3/embed"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials"