Fix typo in code and rename method

1.Change 'detaultStateImpl' to 'defaultStateImpl' in state.go. 2.Rename method IsDelete() to IsDeleted() in state_delta.go. Change-Id: I8afc4aa4542ca9fed1f904db4ae5e79d8d0f4599 Signed-off-by: grapebaba <281165273@qq.com>
hyperledger · Aug 23, 2016 · db3a694 · db3a694
1 parent 47c3f6c
commit db3a694
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/core/ledger/statemgmt/raw/state_impl.go b/core/ledger/statemgmt/raw/state_impl.go
@@ -73,7 +73,7 @@ func (impl *StateImpl) AddChangesForPersistence(writeBatch *gorocksdb.WriteBatch
 		updates := delta.GetUpdates(updatedChaincodeID)
 		for updatedKey, value := range updates {
 			compositeKey := statemgmt.ConstructCompositeKey(updatedChaincodeID, updatedKey)
-			if value.IsDelete() {
+			if value.IsDeleted() {
 				writeBatch.DeleteCF(openchainDB.StateCF, compositeKey)
 			} else {
 				writeBatch.PutCF(openchainDB.StateCF, compositeKey, value.GetValue())

diff --git a/core/ledger/statemgmt/state/config.go b/core/ledger/statemgmt/state/config.go
@@ -42,7 +42,7 @@ func loadConfig() {
 		stateImplName, stateImplConfigs, deltaHistorySize)
 
 	if len(stateImplName) == 0 {
-		stateImplName = detaultStateImpl
+		stateImplName = defaultStateImpl
 		stateImplConfigs = nil
 	} else if stateImplName != "buckettree" && stateImplName != "trie" && stateImplName != "raw" {
 		panic(fmt.Errorf("Error during initialization of state implementation. State data structure '%s' is not valid.", stateImplName))

diff --git a/core/ledger/statemgmt/state/state.go b/core/ledger/statemgmt/state/state.go
@@ -31,7 +31,7 @@ import (
 
 var logger = logging.MustGetLogger("state")
 
-const detaultStateImpl = "buckettree"
+const defaultStateImpl = "buckettree"
 
 var stateImpl statemgmt.HashableState
 

diff --git a/core/ledger/statemgmt/state_delta.go b/core/ledger/statemgmt/state_delta.go
@@ -96,7 +96,7 @@ func (stateDelta *StateDelta) ApplyChanges(anotherStateDelta *StateDelta) {
 				previousValue = valueHolder.PreviousValue
 			}
 
-			if valueHolder.IsDelete() {
+			if valueHolder.IsDeleted() {
 				stateDelta.Delete(chaincodeID, key, previousValue)
 			} else {
 				stateDelta.Set(chaincodeID, key, valueHolder.Value, previousValue)
@@ -158,7 +158,7 @@ func (stateDelta *StateDelta) ComputeCryptoHash() []byte {
 		for _, key := range sortedKeys {
 			buffer.WriteString(key)
 			updatedValue := chaincodeStateDelta.get(key)
-			if !updatedValue.IsDelete() {
+			if !updatedValue.IsDeleted() {
 				buffer.Write(updatedValue.Value)
 			}
 		}
@@ -225,8 +225,8 @@ type UpdatedValue struct {
 	PreviousValue []byte
 }
 
-// IsDelete checks whether the key was deleted
-func (updatedValue *UpdatedValue) IsDelete() bool {
+// IsDeleted checks whether the key was deleted
+func (updatedValue *UpdatedValue) IsDeleted() bool {
 	return updatedValue.Value == nil
 }
 

diff --git a/core/ledger/statemgmt/state_delta_iterator.go b/core/ledger/statemgmt/state_delta_iterator.go
@@ -36,7 +36,7 @@ func retrieveRelevantKeys(updates map[string]*UpdatedValue, startKey string, end
 		return relevantKeys
 	}
 	for k, v := range updates {
-		if k >= startKey && (endKey == "" || k <= endKey) && !v.IsDelete() {
+		if k >= startKey && (endKey == "" || k <= endKey) && !v.IsDeleted() {
 			relevantKeys = append(relevantKeys, k)
 		}
 	}

diff --git a/core/ledger/statemgmt/trie/trie_delta.go b/core/ledger/statemgmt/trie/trie_delta.go
@@ -37,7 +37,7 @@ func newTrieDelta(stateDelta *statemgmt.StateDelta) *trieDelta {
 	for _, chaincodeID := range chaincodes {
 		updates := stateDelta.GetUpdates(chaincodeID)
 		for key, updatedvalue := range updates {
-			if updatedvalue.IsDelete() {
+			if updatedvalue.IsDeleted() {
 				trieDelta.delete(chaincodeID, key)
 			} else {
 				if stateDelta.RollBackwards {