Improvements: assertions

apache · Jul 5, 2024 · 432d3ce · 432d3ce
1 parent ab0862e
commit 432d3ce
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/accord-core/src/main/java/accord/local/Command.java b/accord-core/src/main/java/accord/local/Command.java
@@ -437,8 +437,7 @@ public static <T extends AbstractCommand> T validate(T validate)
  case CleaningUp:
  break;
  case ReadyToExclude:
- Invariants.checkState(validate.saveStatus() != SaveStatus.Committed ||
- (validate.asCommitted().waitingOn == null || !validate.asCommitted().waitingOn.isWaiting()));
+ Invariants.checkState(validate.saveStatus() != SaveStatus.Committed || validate.asCommitted().waitingOn == null);
  break;
  case WaitingToExecute:
  case ReadyToExecute:
@@ -1150,10 +1149,7 @@ private Committed(CommonAttributes common, SaveStatus status, Timestamp executeA
  super(common, status, promised, executeAt, accepted);
  this.waitingOn = waitingOn;
  Invariants.checkState(common.route().kind().isFullRoute(), "Expected a full route but given %s", common.route().kind());
- if (status.hasBeen(Stable))
- // TODO:
- Invariants.checkState(waitingOn == WaitingOn.EMPTY || waitingOn == null || (waitingOn.txnIds.equals(common.partialDeps().rangeDeps.txnIds()) && waitingOn.keys.equals(common.partialDeps().keyDeps.keys())),
- () -> String.format("Deps do not match; expected (%s, %s) == (%s, %s)", waitingOn.keys, waitingOn.txnIds, common.partialDeps().keyDeps.keys(), common.partialDeps().rangeDeps.txnIds()));
+ if (status.hasBeen(Stable)) Invariants.checkState(waitingOn == WaitingOn.EMPTY || (waitingOn.txnIds.equals(common.partialDeps().rangeDeps.txnIds()) && waitingOn.keys.equals(common.partialDeps().keyDeps.keys())), "Deps do not match; expected (%s, %s) == (%s, %s)", waitingOn.keys, waitingOn.txnIds, common.partialDeps().keyDeps.keys(), common.partialDeps().rangeDeps.txnIds());
  }
 
  @Override
@@ -1254,8 +1250,8 @@ public boolean equals(Object o)
  if (o == null || getClass() != o.getClass()) return false;
  if (!super.equals(o)) return false;
  Executed executed = (Executed) o;
- return Objects.equals(writes, executed.writes);
- //&& Objects.equals(result, executed.result); // TODO: find a different way to check/assert?
+ return Objects.equals(writes, executed.writes)
+ && Objects.equals(result, executed.result); // TODO: find a different way to check/assert?
  }
 
  @Override
@@ -1326,8 +1322,7 @@ public WaitingOn(Keys keys, SortedArrayList<TxnId> txnIds, ImmutableBitSet waiti
  this.keys = keys;
  this.txnIds = txnIds;
  this.waitingOn = waitingOn;
- // TODO
- this.appliedOrInvalidated = appliedOrInvalidated == null ? null : appliedOrInvalidated.isEmpty() ? null : appliedOrInvalidated;
+ this.appliedOrInvalidated = appliedOrInvalidated;
  }
 
  public Timestamp executeAtLeast()