fix: resolve conflict

crescent-network · Oct 23, 2023 · 3d46c78 · 3d46c78
2 parents a534392 + 66fc6ed
commit 3d46c78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/launch b/launch
diff --git a/x/exchange/types/matching.go b/x/exchange/types/matching.go
@@ -174,8 +174,7 @@ func (ctx *MatchingContext) FillOrders(orders []*MemOrder, qty sdk.Int, price sd
 	remainingQty := qty
 	for _, order := range orders {
 		executableQty := order.ExecutableQuantity()
-		if executableQty.IsZero() { // sanity check
-			// panic("executable quantity is zero")
+		if executableQty.IsZero() {
 			continue
 		}
 		executedQty := executableQty.Mul(qty).Quo(totalExecutableQty)