Fix typo

As currently txId not use uuid, fix some typo to be consistent.
Also fix some comments.

Change-Id: Id6fb88aed3da7409f834ea38f5f485cc1f194092
Signed-off-by: grapebaba <[email protected]>

Author: GrapeBaBa

core/ledger/statemgmt/state/state.go

@@ -89,13 +89,13 @@ func (state *State) TxBegin(txID string) {
 
 // TxFinish marks the completion of on-going tx. If txID is not same as of the on-going tx, this call panics
 func (state *State) TxFinish(txID string, txSuccessful bool) {
-	logger.Debugf("txFinish() for txUuid [%s], txSuccessful=[%t]", txID, txSuccessful)
+	logger.Debugf("txFinish() for txId [%s], txSuccessful=[%t]", txID, txSuccessful)
 	if state.currentTxID != txID {
-		panic(fmt.Errorf("Different Uuid in tx-begin [%s] and tx-finish [%s]", state.currentTxID, txID))
+		panic(fmt.Errorf("Different txId in tx-begin [%s] and tx-finish [%s]", state.currentTxID, txID))
 	}
 	if txSuccessful {
 		if !state.currentTxStateDelta.IsEmpty() {
-			logger.Debugf("txFinish() for txUuid [%s] merging state changes", txID)
+			logger.Debugf("txFinish() for txId [%s] merging state changes", txID)
 			state.stateDelta.ApplyChanges(state.currentTxStateDelta)
 			state.txStateDeltaHash[txID] = state.currentTxStateDelta.ComputeCryptoHash()
 			state.updateStateImpl = true
@@ -144,7 +144,7 @@ func (state *State) GetRangeScanIterator(chaincodeID string, startKey string, en
 		stateImplItr), nil
 }
 
-// Set sets state to given value for chaincodeID and key. Does not immideatly writes to DB
+// Set sets state to given value for chaincodeID and key. Does not immediately writes to DB
 func (state *State) Set(chaincodeID string, key string, value []byte) error {
 	logger.Debugf("set() chaincodeID=[%s], key=[%s], value=[%#v]", chaincodeID, key, value)
 	if !state.txInProgress() {
@@ -168,7 +168,7 @@ func (state *State) Set(chaincodeID string, key string, value []byte) error {
 	return nil
 }
 
-// Delete tracks the deletion of state for chaincodeID and key. Does not immideatly writes to DB
+// Delete tracks the deletion of state for chaincodeID and key. Does not immediately writes to DB
 func (state *State) Delete(chaincodeID string, key string) error {
 	logger.Debugf("delete() chaincodeID=[%s], key=[%s]", chaincodeID, key)
 	if !state.txInProgress() {

core/ledger/statemgmt/state_delta.go

@@ -197,7 +197,7 @@ func (chaincodeStateDelta *ChaincodeStateDelta) set(key string, updatedValue, pr
 func (chaincodeStateDelta *ChaincodeStateDelta) remove(key string, previousValue []byte) {
 	updatedKV, ok := chaincodeStateDelta.UpdatedKVs[key]
 	if ok {
-		// Key already exists, just set the previous value
+		// Key already exists, just set the value
 		updatedKV.Value = nil
 	} else {
 		// New key. Create a new entry in the map