fix up

Signed-off-by: Sam Yuan <yy19902439@126.com>
Hyperledger-TWGC · Apr 20, 2021 · 2637a4a · 2637a4a
1 parent d2a92ec
commit 2637a4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/e2e/mock/server.go b/e2e/mock/server.go
@@ -12,14 +12,14 @@ type Server struct {
 // this is the channel size for mock server, peer and orderer
 // when use or send tx to mock server/peer/orderer
 // try not over this size to avoid hang up or over size
-const MOCK_TX_SIZE = 1000
+const MockTxSize = 1000
 
 func NewServer(peerN int, credentials credentials.TransportCredentials) (*Server, error) {
 	var txCs []chan struct{}
 	var peers []*Peer
 
 	for i := 0; i < peerN; i++ {
-		txC := make(chan struct{}, MOCK_TX_SIZE)
+		txC := make(chan struct{}, MockTxSize)
 		peer, err := NewPeer(txC, credentials)
 		if err != nil {
 			return nil, err

diff --git a/pkg/infra/block_collector_test.go b/pkg/infra/block_collector_test.go
@@ -144,19 +144,15 @@ var _ = Describe("BlockCollector", func() {
 			done := make(chan struct{})
 			go instance.Start(context.Background(), block, done, 10, time.Now(), false)
 
-			var wg sync.WaitGroup
-			wg.Add(3)
 			for i := 0; i < 3; i++ {
 				go func() {
-					defer wg.Done()
 					for j := 0; j < 10; j++ {
 						block <- &peer.FilteredBlock{
 							Number:               uint64(j),
 							FilteredTransactions: make([]*peer.FilteredTransaction, 1)}
 					}
 				}()
 			}
-			wg.Wait()
 			Eventually(done).Should(BeClosed())
 		})
 
@@ -166,21 +162,17 @@ var _ = Describe("BlockCollector", func() {
 
 			block := make(chan *peer.FilteredBlock)
 			done := make(chan struct{})
-			go instance.Start(context.Background(), block, done, 10, time.Now(), false)
 
-			var wg sync.WaitGroup
-			wg.Add(5)
+			go instance.Start(context.Background(), block, done, 10, time.Now(), false)
 			for i := 0; i < 5; i++ {
 				go func() {
-					defer wg.Done()
 					for j := 0; j < 10; j++ {
 						block <- &peer.FilteredBlock{
 							Number:               uint64(j),
 							FilteredTransactions: make([]*peer.FilteredTransaction, 1)}
 					}
 				}()
 			}
-			wg.Wait()
 			Eventually(done).Should(BeClosed())
 		})
 	})

diff --git a/pkg/infra/observer_test.go b/pkg/infra/observer_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Observer", func() {
 	})
 
 	It("It should work with mock", func() {
-		txC := make(chan struct{}, mock.MOCK_TX_SIZE)
+		txC := make(chan struct{}, mock.MockTxSize)
 		mpeer, err := mock.NewPeer(txC, nil)
 		Expect(err).NotTo(HaveOccurred())
 		go mpeer.Start()
@@ -82,10 +82,10 @@ var _ = Describe("Observer", func() {
 		blockCollector, err := infra.NewBlockCollector(config.CommitThreshold, len(config.Committers))
 		Expect(err).NotTo(HaveOccurred())
 		blockCh := make(chan *peer.FilteredBlock)
-		go blockCollector.Start(ctx, blockCh, finishCh, mock.MOCK_TX_SIZE, time.Now(), true)
+		go blockCollector.Start(ctx, blockCh, finishCh, mock.MockTxSize, time.Now(), true)
 		go observers.Start(errorCh, blockCh, start)
 		go func() {
-			for i := 0; i < mock.MOCK_TX_SIZE; i++ {
+			for i := 0; i < mock.MockTxSize; i++ {
 				txC <- struct{}{}
 			}
 		}()
@@ -103,7 +103,7 @@ var _ = Describe("Observer", func() {
 		var mpeers []*mock.Peer
 
 		for i := 0; i < TOTAL_PEERS; i++ {
-			txC := make(chan struct{}, mock.MOCK_TX_SIZE)
+			txC := make(chan struct{}, mock.MockTxSize)
 			mpeer, err := mock.NewPeer(txC, nil)
 			Expect(err).NotTo(HaveOccurred())
 			go mpeer.Start()
@@ -142,11 +142,11 @@ var _ = Describe("Observer", func() {
 		blockCollector, err := infra.NewBlockCollector(config.CommitThreshold, len(config.Committers))
 		Expect(err).NotTo(HaveOccurred())
 		blockCh := make(chan *peer.FilteredBlock)
-		go blockCollector.Start(ctx, blockCh, finishCh, mock.MOCK_TX_SIZE, time.Now(), true)
+		go blockCollector.Start(ctx, blockCh, finishCh, mock.MockTxSize, time.Now(), true)
 		go observers.Start(errorCh, blockCh, start)
 		for i := 0; i < TOTAL_PEERS; i++ {
 			go func(k int) {
-				for j := 0; j < mock.MOCK_TX_SIZE; j++ {
+				for j := 0; j < mock.MockTxSize; j++ {
 					txCs[k] <- struct{}{}
 				}
 			}(i)