fix id without prefix

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 = string(unfreezeID([]byte(payload.UnfreezeID)))
+		payload.UnfreezeID = unfreezeIDFrom(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 = string(unfreezeID([]byte(payload.UnfreezeID)))
+		payload.UnfreezeID = unfreezeIDFrom(payload.UnfreezeID)
 	}
 	unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
 	if err != nil {

plugin/dapp/unfreeze/executor/exec_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util"
 	pty "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
+	"encoding/hex"
 )
 
 type execEnv struct {
@@ -68,7 +69,7 @@ func TestUnfreeze(t *testing.T) {
 
 	env := execEnv{
 		10,
-		types.GetDappFork(pty.UnfreezeX, pty.ForkTerminatePartX),
+		types.GetDappFork(pty.UnfreezeX, pty.ForkUnfreezeIDX),
 		1539918074,
 	}
 	ty := pty.UnfreezeType{}
@@ -122,7 +123,7 @@ func TestUnfreeze(t *testing.T) {
 
 	// 提币
 	p2 := &pty.UnfreezeWithdraw{
-		UnfreezeID: string(unfreezeID(createTx.Hash())),
+		UnfreezeID: hex.EncodeToString(createTx.Hash()),
 	}
 	withdrawTx, err := ty.RPC_UnfreezeWithdrawTx(p2)
 	if err != nil {
@@ -156,7 +157,7 @@ func TestUnfreeze(t *testing.T) {
 	// 不是受益人提币
 	{
 		p2 := &pty.UnfreezeWithdraw{
-			UnfreezeID: string(unfreezeID(createTx.Hash())),
+			UnfreezeID: hex.EncodeToString(createTx.Hash()),
 		}
 		withdrawTx, err := ty.RPC_UnfreezeWithdrawTx(p2)
 		if err != nil {
@@ -176,7 +177,7 @@ func TestUnfreeze(t *testing.T) {
 	// 不是创建者终止
 	{
 		p3 := &pty.UnfreezeTerminate{
-			UnfreezeID: string(unfreezeID(createTx.Hash())),
+			UnfreezeID: hex.EncodeToString(createTx.Hash()),
 		}
 		terminateTx, err := ty.RPC_UnfreezeTerminateTx(p3)
 		if err != nil {
@@ -193,7 +194,7 @@ func TestUnfreeze(t *testing.T) {
 
 	// 终止
 	p3 := &pty.UnfreezeTerminate{
-		UnfreezeID: string(unfreezeID(createTx.Hash())),
+		UnfreezeID: hex.EncodeToString(createTx.Hash()),
 	}
 	terminateTx, err := ty.RPC_UnfreezeTerminateTx(p3)
 	if err != nil {
@@ -220,7 +221,7 @@ func TestUnfreeze(t *testing.T) {
 	// 终止后不能继续提币
 	{
 		p2 := &pty.UnfreezeWithdraw{
-			UnfreezeID: string(unfreezeID(createTx.Hash())),
+			UnfreezeID: hex.EncodeToString(createTx.Hash()),
 		}
 		withdrawTx, err := ty.RPC_UnfreezeWithdrawTx(p2)
 		if err != nil {
@@ -237,7 +238,7 @@ func TestUnfreeze(t *testing.T) {
 		assert.Nil(t, receipt)
 	}
 
-	req := types.ReqString{Data: string(unfreezeID(createTx.Hash()))}
+	req := types.ReqString{Data: hex.EncodeToString(createTx.Hash())}
 	_, err = exec.Query("GetUnfreeze", types.Encode(&req))
 	assert.Nil(t, err)
 

plugin/dapp/unfreeze/executor/kv.go

@@ -18,3 +18,7 @@ var (
 func unfreezeID(txHash []byte) []byte {
 	return []byte(fmt.Sprintf("%s%s", id, hex.EncodeToString(txHash)))
 }
+
+func unfreezeIDFrom(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 = string(unfreezeID([]byte(id)))
+	id = string(unfreezeIDFrom(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 = string(unfreezeID([]byte(id)))
+	id = string(unfreezeIDFrom(id))
 	unfreeze, err := loadUnfreeze(id, stateDB)
 	if err != nil {
 		uflog.Error("QueryUnfreeze ", "unfreezeID", id, "err", err)