Commit 4c3e8aef authored by linj's avatar linj

fix local exec

parent fdc9ab2c
...@@ -24,8 +24,6 @@ func (u *Unfreeze) execDelLocal(receiptData *types.ReceiptData) (*types.LocalDBS ...@@ -24,8 +24,6 @@ func (u *Unfreeze) execDelLocal(receiptData *types.ReceiptData) (*types.LocalDBS
} }
kv := u.rollbackUnfreezeCreate(&receipt) kv := u.rollbackUnfreezeCreate(&receipt)
dbSet.KV = append(dbSet.KV, kv...) dbSet.KV = append(dbSet.KV, kv...)
default:
return nil, types.ErrNotSupport
} }
} }
return dbSet, nil return dbSet, nil
......
...@@ -25,7 +25,6 @@ func (u *Unfreeze) execLocal(receiptData *types.ReceiptData) (*types.LocalDBSet, ...@@ -25,7 +25,6 @@ func (u *Unfreeze) execLocal(receiptData *types.ReceiptData) (*types.LocalDBSet,
kv := u.saveUnfreezeCreate(&receipt) kv := u.saveUnfreezeCreate(&receipt)
dbSet.KV = append(dbSet.KV, kv...) dbSet.KV = append(dbSet.KV, kv...)
default: default:
return nil, types.ErrNotSupport
} }
} }
return dbSet, nil return dbSet, nil
......
...@@ -99,6 +99,11 @@ func TestUnfreeze(t *testing.T) { ...@@ -99,6 +99,11 @@ func TestUnfreeze(t *testing.T) {
assert.Equal(t, total-p1.TotalCount, accTmp.Balance) assert.Equal(t, total-p1.TotalCount, accTmp.Balance)
assert.Equal(t, p1.TotalCount, accTmp.Frozen) assert.Equal(t, p1.TotalCount, accTmp.Frozen)
receiptDate := &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
set, err := exec.ExecLocal(createTx, receiptDate, int(1))
assert.Nil(t, err)
assert.NotNil(t, set)
// 提币 // 提币
p2 := &pty.UnfreezeWithdraw{ p2 := &pty.UnfreezeWithdraw{
UnfreezeID: string(unfreezeID(createTx.Hash())), UnfreezeID: string(unfreezeID(createTx.Hash())),
...@@ -127,6 +132,11 @@ func TestUnfreeze(t *testing.T) { ...@@ -127,6 +132,11 @@ func TestUnfreeze(t *testing.T) {
assert.Equal(t, u.Remaining, accATmp.Frozen) assert.Equal(t, u.Remaining, accATmp.Frozen)
assert.Equal(t, accountB.Balance+p1.TotalCount-u.Remaining, accBTmp.Balance) assert.Equal(t, accountB.Balance+p1.TotalCount-u.Remaining, accBTmp.Balance)
receiptDate2 := &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
set, err = exec.ExecLocal(withdrawTx, receiptDate2, int(1))
assert.Nil(t, err)
assert.NotNil(t, set)
// 不是受益人提币 // 不是受益人提币
{ {
p2 := &pty.UnfreezeWithdraw{ p2 := &pty.UnfreezeWithdraw{
...@@ -185,6 +195,11 @@ func TestUnfreeze(t *testing.T) { ...@@ -185,6 +195,11 @@ func TestUnfreeze(t *testing.T) {
assert.Equal(t, total+total, accATmp.Balance+accBTmp.Balance) assert.Equal(t, total+total, accATmp.Balance+accBTmp.Balance)
assert.Equal(t, int64(0), accATmp.Frozen) assert.Equal(t, int64(0), accATmp.Frozen)
receiptDate3 := &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
set, err = exec.ExecLocal(terminateTx, receiptDate3, int(1))
assert.Nil(t, err)
assert.NotNil(t, set)
// 终止后不能继续提币 // 终止后不能继续提币
{ {
p2 := &pty.UnfreezeWithdraw{ p2 := &pty.UnfreezeWithdraw{
...@@ -204,6 +219,22 @@ func TestUnfreeze(t *testing.T) { ...@@ -204,6 +219,22 @@ func TestUnfreeze(t *testing.T) {
assert.Equal(t, pty.ErrUnfreezeEmptied, err) assert.Equal(t, pty.ErrUnfreezeEmptied, err)
assert.Nil(t, receipt) assert.Nil(t, receipt)
} }
req := types.ReqString{Data: string(unfreezeID(createTx.Hash()))}
_, err = exec.Query("GetUnfreeze", types.Encode(&req))
assert.Nil(t, err)
_, err = exec.Query("GetUnfreezeWithdraw", types.Encode(&req))
assert.Nil(t, err)
_, err = exec.ExecDelLocal(terminateTx, receiptDate3, int(1))
assert.Nil(t, err)
_, err = exec.ExecDelLocal(withdrawTx, receiptDate2, int(1))
assert.Nil(t, err)
_, err = exec.ExecDelLocal(createTx, receiptDate, int(1))
assert.Nil(t, err)
} }
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) { func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment