rename

plugin/dapp/unfreeze/executor/exec.go

@@ -49,7 +49,7 @@ func (u *Unfreeze) Exec_Create(payload *pty.UnfreezeCreate, tx *types.Transactio
 // Exec_Withdraw 执行冻结合约中提币
 func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transaction, index int) (*types.Receipt, error) {
 	if types.IsDappFork(u.GetHeight(), pty.UnfreezeX, pty.ForkUnfreezeIDX) {
-		payload.UnfreezeID = unfreezeIDFrom(payload.UnfreezeID)
+		payload.UnfreezeID = unfreezeIDFromHex(payload.UnfreezeID)
 	}
 	unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
 	if err != nil {
@@ -88,7 +88,7 @@ func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transa
 // Exec_Terminate 执行终止冻结合约
 func (u *Unfreeze) Exec_Terminate(payload *pty.UnfreezeTerminate, tx *types.Transaction, index int) (*types.Receipt, error) {
 	if types.IsDappFork(u.GetHeight(), pty.UnfreezeX, pty.ForkUnfreezeIDX) {
-		payload.UnfreezeID = unfreezeIDFrom(payload.UnfreezeID)
+		payload.UnfreezeID = unfreezeIDFromHex(payload.UnfreezeID)
 	}
 	unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
 	if err != nil {

plugin/dapp/unfreeze/executor/kv.go

@@ -19,6 +19,6 @@ func unfreezeID(txHash []byte) []byte {
 	return []byte(fmt.Sprintf("%s%s", id, hex.EncodeToString(txHash)))
 }
 
-func unfreezeIDFrom(txHash string) string {
+func unfreezeIDFromHex(txHash string) string {
 	return fmt.Sprintf("%s%s", id, txHash)
 }

plugin/dapp/unfreeze/executor/query.go

@@ -35,7 +35,7 @@ func (u *Unfreeze) Query_ListUnfreezeByBeneficiary(in *pty.ReqUnfreezes) (types.
 
 // QueryWithdraw 查询可提币状态
 func QueryWithdraw(stateDB dbm.KV, id string) (types.Message, error) {
-	id = unfreezeIDFrom(id)
+	id = unfreezeIDFromHex(id)
 	unfreeze, err := loadUnfreeze(id, stateDB)
 	if err != nil {
 		uflog.Error("QueryWithdraw ", "unfreezeID", id, "err", err)
@@ -67,7 +67,7 @@ func getWithdrawAvailable(unfreeze *pty.Unfreeze, calcTime int64) (int64, error)
 
 // QueryUnfreeze 查询合约状态
 func QueryUnfreeze(stateDB dbm.KV, id string) (types.Message, error) {
-	id = unfreezeIDFrom(id)
+	id = unfreezeIDFromHex(id)
 	unfreeze, err := loadUnfreeze(id, stateDB)
 	if err != nil {
 		uflog.Error("QueryUnfreeze ", "unfreezeID", id, "err", err)