Merge remote-tracking branch 'upstream/master' into filtering-feature

Makefile

@@ -8,7 +8,9 @@ xdr/Stellar-overlay.x \
 xdr/Stellar-transaction.x \
 xdr/Stellar-types.x
 
-.PHONY: xdr
+XDRGEN_COMMIT=3f6808cd161d72474ffbe9eedbd7013de7f92748
+
+.PHONY: xdr xdr-clean xdr-update
 
 keystore:
 	$(MAKE) -C services/keystore/ docker-build
@@ -32,7 +34,23 @@ gxdr/xdr_generated.go: $(XDRS)
 	go run github.com/xdrpp/goxdr/cmd/goxdr -p gxdr -enum-comments -o $@ $(XDRS)
 	go fmt $@
 
-xdr/xdr_generated.go: $(XDRS) Rakefile Gemfile.lock
-	bundle exec rake xdr:generate
+xdr/%.x:
+	curl -Lsf -o $@ https://raw.githubusercontent.com/stellar/stellar-core/master/src/$@
+
+xdr/xdr_generated.go: $(XDRS)
+	docker run -it --rm -v $$PWD:/wd -w /wd ruby /bin/bash -c '\
+		gem install specific_install -v 0.3.7 && \
+		gem specific_install https://github.com/stellar/xdrgen.git -b $(XDRGEN_COMMIT) && \
+		xdrgen \
+			--language go \
+			--namespace xdr \
+			--output xdr/ \
+			$(XDRS)'
+	go fmt $@
 
 xdr: gxdr/xdr_generated.go xdr/xdr_generated.go
+
+xdr-clean:
+	rm xdr/*.x || true
+
+xdr-update: xdr-clean xdr

services/horizon/internal/test/integration/integration.go

@@ -344,7 +344,8 @@ func (i *Test) StartHorizon() error {
 		"port":                          "8000",
 		// due to ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING
 		"checkpoint-frequency": "8",
-		"per-hour-rate-limit":  "0", // disable rate limiting
+		"per-hour-rate-limit":  "0",  // disable rate limiting
+		"max-db-connections":   "50", // the postgres container supports 100 connections, be conservative
 	}
 
 	merged := MergeMaps(defaultArgs, i.config.HorizonParameters)

xdr/xdr_generated.go

@@ -1,5 +1,6 @@
 //lint:file-ignore S1005 The issue should be fixed in xdrgen. Unfortunately, there's no way to ignore a single file in staticcheck.
 //lint:file-ignore U1000 fmtTest is not needed anywhere, should be removed in xdrgen.
+
 // Package xdr is generated from:
 //
 //  xdr/Stellar-SCP.x