fix PrepareTime set

plugin/dapp/retrieve/executor/exec_del_local.go

@@ -53,7 +53,7 @@ func (c *Retrieve) ExecDelLocal_Backup(backup *rt.BackupRetrieve, tx *types.Tran
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecDelLocal_Backup")
 
-	info := rt.RetrieveQuery{BackupAddress: backup.BackupAddress, DefaultAddress: backup.DefaultAddress, DelayPeriod: backup.DelayPeriod, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrieveBackup}
+	info := createRetrieve(backup.BackupAddress, backup.DefaultAddress, retrieveBackup)
 	kv, err := DelRetrieveInfo(&info, retrieveBackup, c.GetLocalDB())
 	if err != nil {
 		return set, nil
@@ -71,7 +71,7 @@ func (c *Retrieve) ExecDelLocal_Prepare(pre *rt.PrepareRetrieve, tx *types.Trans
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecDelLocal_Prepare")
 
-	info := rt.RetrieveQuery{BackupAddress: pre.BackupAddress, DefaultAddress: pre.DefaultAddress, DelayPeriod: zeroDelay, PrepareTime: c.GetBlockTime(), RemainTime: zeroRemainTime, Status: retrievePrepare}
+	info := createRetrieve(pre.BackupAddress, pre.DefaultAddress, retrievePrepare)
 	kv, err := DelRetrieveInfo(&info, retrievePrepare, c.GetLocalDB())
 	if err != nil {
 		return set, nil
@@ -89,7 +89,7 @@ func (c *Retrieve) ExecDelLocal_Perform(perf *rt.PerformRetrieve, tx *types.Tran
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecDelLocal_Perform")
 
-	info := rt.RetrieveQuery{BackupAddress: perf.BackupAddress, DefaultAddress: perf.DefaultAddress, DelayPeriod: zeroDelay, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrievePerform}
+	info := createRetrieve(perf.BackupAddress, perf.DefaultAddress, retrievePerform)
 	kv, err := DelRetrieveInfo(&info, retrievePerform, c.GetLocalDB())
 	if err != nil {
 		return set, nil
@@ -118,7 +118,7 @@ func (c *Retrieve) ExecDelLocal_Cancel(cancel *rt.CancelRetrieve, tx *types.Tran
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecDelLocal_Cancel")
 
-	info := rt.RetrieveQuery{BackupAddress: cancel.BackupAddress, DefaultAddress: cancel.DefaultAddress, DelayPeriod: zeroDelay, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrieveCancel}
+	info := createRetrieve(cancel.BackupAddress, cancel.DefaultAddress, retrieveCancel)
 	kv, err := DelRetrieveInfo(&info, retrieveCancel, c.GetLocalDB())
 	if err != nil {
 		return set, nil

plugin/dapp/retrieve/executor/exec_local.go

@@ -59,8 +59,8 @@ func SaveRetrieveInfo(info *rt.RetrieveQuery, Status int64, db dbm.KVDB) (*types
 func (c *Retrieve) ExecLocal_Backup(backup *rt.BackupRetrieve, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecLocal_Backup")
-	//info := createRetrieve(backup.BackupAddress)
-	info := rt.RetrieveQuery{BackupAddress: backup.BackupAddress, DefaultAddress: backup.DefaultAddress, DelayPeriod: backup.DelayPeriod, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrieveBackup}
+	info := createRetrieve(backup.BackupAddress, backup.DefaultAddress, retrieveBackup)
+	info.DelayPeriod = backup.DelayPeriod
 	kv, err := SaveRetrieveInfo(&info, retrieveBackup, c.GetLocalDB())
 	if err != nil {
 		return set, nil
@@ -78,7 +78,8 @@ func (c *Retrieve) ExecLocal_Prepare(pre *rt.PrepareRetrieve, tx *types.Transact
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecLocal_Prepare")
 
-	info := rt.RetrieveQuery{BackupAddress: pre.BackupAddress, DefaultAddress: pre.DefaultAddress, DelayPeriod: zeroDelay, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrievePrepare}
+	info := createRetrieve(pre.BackupAddress, pre.DefaultAddress, retrievePrepare)
+	info.PrepareTime = c.GetBlockTime()
 	kv, err := SaveRetrieveInfo(&info, retrievePrepare, c.GetLocalDB())
 	if err != nil {
 		return set, nil
@@ -96,7 +97,7 @@ func (c *Retrieve) ExecLocal_Perform(perf *rt.PerformRetrieve, tx *types.Transac
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecLocal_Perf")
 
-	info := rt.RetrieveQuery{BackupAddress: perf.BackupAddress, DefaultAddress: perf.DefaultAddress, DelayPeriod: zeroDelay, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrievePerform}
+	info := createRetrieve(perf.BackupAddress, perf.DefaultAddress, retrievePerform)
 	kv, err := SaveRetrieveInfo(&info, retrievePerform, c.GetLocalDB())
 	if err != nil {
 		return set, nil
@@ -125,7 +126,7 @@ func (c *Retrieve) ExecLocal_Cancel(cancel *rt.CancelRetrieve, tx *types.Transac
 	set := &types.LocalDBSet{}
 	rlog.Debug("Retrieve ExecLocal_Cancel")
 
-	info := rt.RetrieveQuery{BackupAddress: cancel.BackupAddress, DefaultAddress: cancel.DefaultAddress, DelayPeriod: zeroDelay, PrepareTime: zeroPrepareTime, RemainTime: zeroRemainTime, Status: retrieveCancel}
+	info := createRetrieve(cancel.BackupAddress, cancel.DefaultAddress, retrieveCancel)
 	kv, err := SaveRetrieveInfo(&info, retrieveCancel, c.GetLocalDB())
 	if err != nil {
 		return set, nil