Merge "Fix typo in comment and error messages"

bccsp/pkcs11/aes_test.go

@@ -270,7 +270,7 @@ func TestCBCPKCS7Encrypt_EmptyPlaintext(t *testing.T) {
 	// As part of the padding, at least one block gets encrypted (while the first block is the IV)
 	const expectedLength = aes.BlockSize + aes.BlockSize
 	if len(ciphertext) != expectedLength {
-		t.Fatalf("Wrong ciphertext length. Expected %d, recieved %d", expectedLength, len(ciphertext))
+		t.Fatalf("Wrong ciphertext length. Expected %d, received %d", expectedLength, len(ciphertext))
 	}
 
 	t.Log("Ciphertext length: ", len(ciphertext))

bccsp/sw/aes_test.go

@@ -273,7 +273,7 @@ func TestCBCPKCS7Encrypt_EmptyPlaintext(t *testing.T) {
 	// As part of the padding, at least one block gets encrypted (while the first block is the IV)
 	const expectedLength = aes.BlockSize + aes.BlockSize
 	if len(ciphertext) != expectedLength {
-		t.Fatalf("Wrong ciphertext length. Expected %d, recieved %d", expectedLength, len(ciphertext))
+		t.Fatalf("Wrong ciphertext length. Expected %d, received %d", expectedLength, len(ciphertext))
 	}
 
 	t.Log("Ciphertext length: ", len(ciphertext))

bddtests/context.go

@@ -108,9 +108,9 @@ func (b *BDDContext) beforeScenario(scenarioOrScenarioOutline interface{}) {
 	b.scenarioOrScenarioOutline = scenarioOrScenarioOutline
 	//switch t := scenarioOrScenarioOutline.(type) {
 	//case *gherkin.Scenario:
-	//	fmt.Printf("Scenario recieved %v", t)
+	//	fmt.Printf("Scenario received %v", t)
 	//case *gherkin.ScenarioOutline:
-	//	fmt.Printf("ScenarioOutline recieved %v", t)
+	//	fmt.Printf("ScenarioOutline received %v", t)
 	//}
 }
 

bddtests/context_endorser.go

@@ -163,7 +163,7 @@ func (b *BDDContext) userCreatesADeploymentSpecUsingChaincodeSpecAndDevopsOnPeer
 func getContextAndCancelForTimeoutInSecs(parentCtx context.Context, timeoutInSecs string) (context.Context, context.CancelFunc, error) {
 	var err error
 	errRetFunc := func() error {
-		return fmt.Errorf("Error building context and cancel func with timout '%s':  %s", timeoutInSecs, err)
+		return fmt.Errorf("Error building context and cancel func with timeout '%s':  %s", timeoutInSecs, err)
 	}
 	var (
 		durationToWait time.Duration

core/chaincode/shim/handler.go

@@ -550,7 +550,7 @@ func (handler *Handler) handleGetStateByRange(startKey, endKey string, txid stri
 	}
 
 	// Incorrect chaincode message received
-	chaincodeLogger.Errorf("Incorrect chaincode message %s recieved. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
+	chaincodeLogger.Errorf("Incorrect chaincode message %s received. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
 	return nil, errors.New("Incorrect chaincode message received")
 }
 
@@ -598,7 +598,7 @@ func (handler *Handler) handleQueryStateNext(id, txid string) (*pb.QueryResponse
 	}
 
 	// Incorrect chaincode message received
-	chaincodeLogger.Errorf("Incorrect chaincode message %s recieved. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
+	chaincodeLogger.Errorf("Incorrect chaincode message %s received. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
 	return nil, errors.New("Incorrect chaincode message received")
 }
 
@@ -646,7 +646,7 @@ func (handler *Handler) handleQueryStateClose(id, txid string) (*pb.QueryRespons
 	}
 
 	// Incorrect chaincode message received
-	chaincodeLogger.Errorf("Incorrect chaincode message %s recieved. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
+	chaincodeLogger.Errorf("Incorrect chaincode message %s received. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
 	return nil, errors.New("Incorrect chaincode message received")
 }
 
@@ -694,7 +694,7 @@ func (handler *Handler) handleGetQueryResult(query string, txid string) (*pb.Que
 	}
 
 	// Incorrect chaincode message received
-	chaincodeLogger.Errorf("Incorrect chaincode message %s recieved. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
+	chaincodeLogger.Errorf("Incorrect chaincode message %s received. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
 	return nil, errors.New("Incorrect chaincode message received")
 }
 
@@ -742,7 +742,7 @@ func (handler *Handler) handleGetHistoryForKey(key string, txid string) (*pb.Que
 	}
 
 	// Incorrect chaincode message received
-	chaincodeLogger.Errorf("Incorrect chaincode message %s recieved. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
+	chaincodeLogger.Errorf("Incorrect chaincode message %s received. Expecting %s or %s", responseMsg.Type, pb.ChaincodeMessage_RESPONSE, pb.ChaincodeMessage_ERROR)
 	return nil, errors.New("Incorrect chaincode message received")
 }
 

core/chaincode/shim/java/src/main/java/org/hyperledger/fabric/shim/impl/Handler.java

@@ -672,7 +672,7 @@ private ByteString invokeChaincodeSupport(String txId, Type messageType, ByteStr
 			}
 
 			// Incorrect chaincode message received
-			logger.error(String.format("Incorrect chaincode message %s recieved. Expecting %s or %s", response.getType(), RESPONSE, ERROR));
+			logger.error(String.format("Incorrect chaincode message %s received. Expecting %s or %s", response.getType(), RESPONSE, ERROR));
 			throw new RuntimeException("Incorrect chaincode message received");
 		} finally {
 			deleteChannel(txId);

events/consumer/consumer.go

@@ -140,7 +140,7 @@ func (ec *EventsClient) UnregisterAsync(ies []*ehpb.Interest) error {
 	return err
 }
 
-// Recv recieves next event - use when client has not called Start
+// Recv receives next event - use when client has not called Start
 func (ec *EventsClient) Recv() (*ehpb.Event, error) {
 	in, err := ec.stream.Recv()
 	if err == io.EOF {