Only move to RESOLVED state if dispute acceptance is there

Author: cpacia

wallet/listeners/transaction_listener.go

@@ -56,16 +56,16 @@ func (l *TransactionListener) getOrderDetails(orderID string, address btc.Addres
 }
 
 // cleanupOrderState - scan each order to ensure the state in the db matches the state of the contract stored
-func (l *TransactionListener) cleanupOrderState(isSale bool, txid string, output wallet.TransactionOutput, contract *pb.RicardianContract, state pb.OrderState, funded bool, records []*wallet.TransactionRecord)  {
+func (l *TransactionListener) cleanupOrderState(isSale bool, txid string, output wallet.TransactionOutput, contract *pb.RicardianContract, state pb.OrderState, funded bool, records []*wallet.TransactionRecord) {
 
 	orderId, err := calcOrderId(contract.BuyerOrder)
 	if err != nil {
 		return
 	}
 	log.Debugf("Cleaning up order state for: #%s\n", orderId)
 
-	if contract.DisputeResolution != nil && state != pb.OrderState_RESOLVED {
-		log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_RESOLVED)
+	if contract.DisputeResolution != nil && state != pb.OrderState_DECIDED && state != pb.OrderState_RESOLVED {
+		log.Infof("Out of sync order. Found %s and should either DECIDED be %s\n", state, pb.OrderState_RESOLVED)
 		if isSale {
 			l.db.Sales().Put(orderId, *contract, pb.OrderState_RESOLVED, false)
 		} else {