Skip to content

Commit 4eaca4a

Browse files
authored
make megavault withdrawal logging more succinct (#2607)
1 parent 8f0899e commit 4eaca4a

File tree

1 file changed

+4
-37
lines changed

1 file changed

+4
-37
lines changed

protocol/x/vault/keeper/withdraw.go

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func (k Keeper) RedeemFromMainAndSubVaults(
290290

291291
_, perpetual, marketParam, marketPrice, err := k.GetVaultClobPerpAndMarket(ctx, *vaultId)
292292
if err != nil {
293-
if simulate {
293+
if !simulate {
294294
log.DebugLog(
295295
ctx,
296296
"Megavault withdrawal: failed to get perpetual and market. Skipping this vault",
@@ -299,20 +299,12 @@ func (k Keeper) RedeemFromMainAndSubVaults(
299299
"Error",
300300
err,
301301
)
302-
} else {
303-
log.ErrorLogWithError(
304-
ctx,
305-
"Megavault withdrawal: error when getting perpetual and market. Skipping this vault",
306-
err,
307-
"Vault ID",
308-
vaultId,
309-
)
310302
}
311303
continue
312304
}
313305
leverage, equity, err := k.GetVaultLeverageAndEquity(ctx, *vaultId, &perpetual, &marketPrice)
314306
if err != nil {
315-
if simulate {
307+
if !simulate {
316308
log.DebugLog(
317309
ctx,
318310
"Megavault withdrawal: failed to get vault leverage and equity. Skipping this vault",
@@ -321,14 +313,6 @@ func (k Keeper) RedeemFromMainAndSubVaults(
321313
"Error",
322314
err,
323315
)
324-
} else {
325-
log.ErrorLogWithError(
326-
ctx,
327-
"Megavault withdrawal: error when getting vault leverage and equity. Skipping this vault",
328-
err,
329-
"Vault ID",
330-
vaultId,
331-
)
332316
}
333317
continue
334318
}
@@ -343,7 +327,7 @@ func (k Keeper) RedeemFromMainAndSubVaults(
343327
&marketParam,
344328
)
345329
if err != nil {
346-
if simulate {
330+
if !simulate {
347331
log.DebugLog(
348332
ctx,
349333
"Megavault withdrawal: failed to get vault withdrawal slippage. Skipping this vault",
@@ -352,14 +336,6 @@ func (k Keeper) RedeemFromMainAndSubVaults(
352336
"Error",
353337
err,
354338
)
355-
} else {
356-
log.ErrorLogWithError(
357-
ctx,
358-
"Megavault withdrawal: error when getting vault withdrawal slippage. Skipping this vault",
359-
err,
360-
"Vault ID",
361-
vaultId,
362-
)
363339
}
364340
continue
365341
}
@@ -371,7 +347,7 @@ func (k Keeper) RedeemFromMainAndSubVaults(
371347
quantumsToTransfer := new(big.Int).Quo(redeemedFromSubVault.Num(), redeemedFromSubVault.Denom())
372348

373349
if quantumsToTransfer.Sign() <= 0 || !quantumsToTransfer.IsUint64() {
374-
if simulate {
350+
if !simulate {
375351
log.DebugLog(
376352
ctx,
377353
"Megavault withdrawal: quantums to transfer is invalid. Skipping this vault",
@@ -380,15 +356,6 @@ func (k Keeper) RedeemFromMainAndSubVaults(
380356
"Quantums",
381357
quantumsToTransfer,
382358
)
383-
} else {
384-
log.ErrorLog(
385-
ctx,
386-
"Megavault withdrawal: quantums to transfer is invalid. Skipping this vault",
387-
"Vault ID",
388-
vaultId,
389-
"Quantums",
390-
quantumsToTransfer,
391-
)
392359
}
393360
continue
394361
}

0 commit comments

Comments
 (0)