Resolve conflicts

Signed-off-by: Arkadi Piven <[email protected]>

integration/smartbft/smartbft_test.go

@@ -1665,7 +1665,6 @@ var _ = Describe("EndToEnd Smart BFT configuration test", func() {
 			invokeQuery(network, peer, network.Orderers[numberKill], channel, 80)
 		})
 
-<<<<<<< HEAD
 		It("smartbft the leader froze, waiting for an answer", func() {
 			networkConfig := nwo.MultiNodeSmartBFT()
 			networkConfig.Channels = nil
@@ -1921,7 +1920,8 @@ var _ = Describe("EndToEnd Smart BFT configuration test", func() {
 			Eventually(ordererRunners[2].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("deleteRequest"))
 			Eventually(ordererRunners[3].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("deleteRequest"))
 
-		FIt("smartbft block deliverer test", func() {
+		})
+		It("smartbft block deliverer test", func() {
 			smartBftBlockDelivererTest(
 				testDir,
 				client,

internal/pkg/peer/blocksprovider/deliverer_test.go

@@ -37,7 +37,6 @@ import (
 
 var _ = Describe("CFT-Deliverer", func() {
 	var (
-<<<<<<< HEAD
 		d                                  *blocksprovider.Deliverer
 		ccs                                []*grpc.ClientConn
 		fakeDialer                         *fake.Dialer
@@ -58,24 +57,6 @@ var _ = Describe("CFT-Deliverer", func() {
 		mutex                              sync.Mutex
 		tempDir                            string
 		channelConfig                      *common.Config
-=======
-		d                           *blocksprovider.Deliverer
-		ccs                         []*grpc.ClientConn
-		fakeDialer                  *fake.Dialer
-		fakeBlockHandler            *fake.BlockHandler
-		fakeOrdererConnectionSource *fake.OrdererConnectionSource
-		fakeLedgerInfo              *fake.LedgerInfo
-		fakeBlockVerifier           *fake.BlockVerifier
-		fakeSigner                  *fake.Signer
-		fakeDeliverStreamer         *fake.DeliverStreamer
-		fakeDeliverClient           *fake.DeliverClient
-		fakeSleeper                 *fake.Sleeper
-		fakeDurationExceededHandler *fake.DurationExceededHandler
-		doneC                       chan struct{}
-		recvStep                    chan struct{}
-		endC                        chan struct{}
-		mutex                       sync.Mutex
->>>>>>> 270bf4148 (CFT Block Puller: Reset total sleep time)
 	)
 
 	BeforeEach(func() {
@@ -141,7 +122,6 @@ var _ = Describe("CFT-Deliverer", func() {
 		fakeDurationExceededHandler = &fake.DurationExceededHandler{}
 		fakeDurationExceededHandler.DurationExceededHandlerReturns(false)
 
-
 		channelConfig, fakeCryptoProvider, err = testSetup(tempDir, "CFT")
 		Expect(err).NotTo(HaveOccurred())
 
@@ -324,11 +304,7 @@ var _ = Describe("CFT-Deliverer", func() {
 		})
 
 		It("hits the maximum sleep time value in an exponential fashion and retries until exceeding the max retry duration", func() {
-<<<<<<< HEAD
 			Eventually(fakeDurationExceededHandler.DurationExceededHandlerCallCount, 5*time.Second).Should(BeNumerically(">", 0))
-=======
-			Eventually(fakeDurationExceededHandler.DurationExceededHandlerCallCount).Should(BeNumerically(">", 0))
->>>>>>> 270bf4148 (CFT Block Puller: Reset total sleep time)
 			Eventually(endC).Should(BeClosed())
 			Eventually(fakeSleeper.SleepCallCount, 5*time.Second).Should(Equal(380))
 			Expect(fakeSleeper.SleepArgsForCall(25)).To(Equal(9539 * time.Millisecond))
@@ -432,11 +408,7 @@ var _ = Describe("CFT-Deliverer", func() {
 			Expect(fakeSleeper.SleepArgsForCall(26)).To(Equal(10 * time.Second))
 			Expect(fakeSleeper.SleepArgsForCall(27)).To(Equal(10 * time.Second))
 			Expect(fakeSleeper.SleepArgsForCall(499)).To(Equal(10 * time.Second))
-<<<<<<< HEAD
 			Eventually(fakeDurationExceededHandler.DurationExceededHandlerCallCount, 5*time.Second).Should(Equal(120))
-=======
-			Eventually(fakeDurationExceededHandler.DurationExceededHandlerCallCount).Should(Equal(120))
->>>>>>> 270bf4148 (CFT Block Puller: Reset total sleep time)
 		})
 	})