From 9421afef6d10d792bfc0e4971f774365fc91be60 Mon Sep 17 00:00:00 2001
From: istae <14264581+istae@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:04:16 +0300
Subject: [PATCH 1/3] fix(ci): patch max retrieval forwards

---
 .github/patches/retrieval.patch | 4 ++++
 .github/workflows/beekeeper.yml | 1 +
 pkg/retrieval/retrieval.go      | 2 +-
 retrieval.patch                 | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .github/patches/retrieval.patch
 create mode 100644 retrieval.patch

diff --git a/.github/patches/retrieval.patch b/.github/patches/retrieval.patch
new file mode 100644
index 00000000000..2bde7aa62c6
--- /dev/null
+++ b/.github/patches/retrieval.patch
@@ -0,0 +1,4 @@
+129c129
+< 	maxMultiplexForwards = 2
+---
+> 	maxMultiplexForwards = 0
diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index 01c83d3e233..dd7bd660523 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -70,6 +70,7 @@ jobs:
           # patch pkg/postage/postagecontract/contract.go .github/patches/postagecontract.patch
           # patch pkg/postage/service.go .github/patches/postageservice.patch
           patch pkg/api/postage.go .github/patches/postage_api.patch
+          patch pkg/retrieval/retrieval.go .github/patches/retrieval.patch
           make binary
           mv dist/bee bee-1
       - name: Apply patches and build - 2
diff --git a/pkg/retrieval/retrieval.go b/pkg/retrieval/retrieval.go
index 551f08e6310..6b5a037e248 100644
--- a/pkg/retrieval/retrieval.go
+++ b/pkg/retrieval/retrieval.go
@@ -178,7 +178,7 @@ func (s *Service) RetrieveChunk(ctx context.Context, chunkAddr, sourcePeerAddr s
 		}
 
 		resultC := make(chan retrievalResult, 1)
-		retryC := make(chan struct{}, forwards)
+		retryC := make(chan struct{}, forwards+1)
 
 		retry := func() {
 			select {
diff --git a/retrieval.patch b/retrieval.patch
new file mode 100644
index 00000000000..df5b53e560b
--- /dev/null
+++ b/retrieval.patch
@@ -0,0 +1,4 @@
+129c129
+< 	maxMultiplexForwards = 2
+---
+> 	maxMultiplexForwards = 1

From e38ff72c2317db1f2210245c2c9f865a7ade3efe Mon Sep 17 00:00:00 2001
From: istae <14264581+istae@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:14:45 +0300
Subject: [PATCH 2/3] fix: asd

---
 retrieval.patch | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 retrieval.patch

diff --git a/retrieval.patch b/retrieval.patch
deleted file mode 100644
index df5b53e560b..00000000000
--- a/retrieval.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-129c129
-< 	maxMultiplexForwards = 2
----
-> 	maxMultiplexForwards = 1

From fc87e8c5eddb5b90f7c31facf72d940ec19d8643 Mon Sep 17 00:00:00 2001
From: istae <14264581+istae@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:45:13 +0300
Subject: [PATCH 3/3] fix: direct uploads

---
 .github/workflows/beekeeper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index dd7bd660523..eeec2b3bb34 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -13,7 +13,7 @@ env:
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.9"
   BEELOCAL_BRANCH: "main"
-  BEEKEEPER_BRANCH: "master"
+  BEEKEEPER_BRANCH: "settlements-fix"
   BEEKEEPER_METRICS_ENABLED: false
   REACHABILITY_OVERRIDE_PUBLIC: true
   BATCHFACTOR_OVERRIDE_PUBLIC: 2