Merge branch 'v2' into InFlight

Author: yacovm

test/basic_test.go

@@ -1897,7 +1897,11 @@ func TestBlacklistAndRedemption(t *testing.T) {
 		rand.Read(txID)
 		nodes[1].Submit(Request{ID: hex.EncodeToString(txID), ClientID: "alice"})
 		for i := 0; i < len(nodes); i++ {
-			<-nodes[i].Delivered
+			select {
+			case <-nodes[i].Delivered:
+			case <-stop:
+				return
+			}
 		}
 		md := &smartbftprotos.ViewMetadata{}
 		err = proto.Unmarshal(nodes[1].lastDecision.Proposal.Metadata, md)
@@ -2017,7 +2021,11 @@ func TestBlacklistMultipleViewChanges(t *testing.T) {
 		rand.Read(txID)
 		nodes[3].Submit(Request{ID: hex.EncodeToString(txID), ClientID: "alice"})
 		for i := 0; i < len(nodes); i++ {
-			<-nodes[i].Delivered
+			select {
+			case <-nodes[i].Delivered:
+			case <-stop:
+				return
+			}
 		}
 		md := &smartbftprotos.ViewMetadata{}
 		err = proto.Unmarshal(nodes[3].lastDecision.Proposal.Metadata, md)