Fix disputed but accepted out of sync orders

hoffmabc · hoffmabc · commit 2dacc0fc31c3 · 2020-04-21T07:35:10.000-04:00
diff --git a/wallet/listeners/transaction_listener.go b/wallet/listeners/transaction_listener.go
@@ -76,12 +76,12 @@ func (l *TransactionListener) cleanupOrderState(isSale bool, contract *pb.Ricard
 		}
 	}
 
-	if contract.DisputeAcceptance != nil && state == pb.OrderState_FULFILLED {
-		log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_DECIDED)
+	if contract.DisputeAcceptance != nil && state == pb.OrderState_DISPUTED {
+		log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_RESOLVED)
 		if isSale {
-			err = l.db.Sales().Put(orderId, *contract, pb.OrderState_DECIDED, false)
+			err = l.db.Sales().Put(orderId, *contract, pb.OrderState_RESOLVED, false)
 		} else {
-			err = l.db.Purchases().Put(orderId, *contract, pb.OrderState_DECIDED, false)
+			err = l.db.Purchases().Put(orderId, *contract, pb.OrderState_RESOLVED, false)
 		}
 		if err != nil {
 			log.Errorf("Error saving new order state: %s", err)

Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,12 @@ func (l TransactionListener) cleanupOrderState(isSale bool, contract pb.Ricard`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- if contract.DisputeAcceptance != nil && state == pb.OrderState_FULFILLED {`
`80`		`- log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_DECIDED)`
	`79`	`+ if contract.DisputeAcceptance != nil && state == pb.OrderState_DISPUTED {`
	`80`	`+ log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_RESOLVED)`
`81`	`81`	`if isSale {`
`82`		`- err = l.db.Sales().Put(orderId, *contract, pb.OrderState_DECIDED, false)`
	`82`	`+ err = l.db.Sales().Put(orderId, *contract, pb.OrderState_RESOLVED, false)`
`83`	`83`	`} else {`
`84`		`- err = l.db.Purchases().Put(orderId, *contract, pb.OrderState_DECIDED, false)`
	`84`	`+ err = l.db.Purchases().Put(orderId, *contract, pb.OrderState_RESOLVED, false)`
`85`	`85`	`}`
`86`	`86`	`if err != nil {`
`87`	`87`	`log.Errorf("Error saving new order state: %s", err)`