Skip to content

Commit

Permalink
revert merge conflict changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Neeharika-Sompalli committed Dec 7, 2023
1 parent f276c46 commit ab2e8e9
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.EXPECT_STREAMLINED_INGEST_RECORDS;
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.FULLY_NONDETERMINISTIC;
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.HIGHLY_NON_DETERMINISTIC_FEES;
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_CONSTRUCTOR_PARAMETERS;
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_CONTRACT_CALL_RESULTS;
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_FUNCTION_PARAMETERS;
import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_NONCE;
Expand Down Expand Up @@ -737,6 +738,8 @@ private boolean shouldSkip(@NonNull final String expectedName, @NonNull final Cl
// It is unlikely we have _any_ tests with nondeterministic logs but deterministic
// call results, so we just use the same match mode for both
return matchModes.contains(NONDETERMINISTIC_CONTRACT_CALL_RESULTS);
} else if ("constructorParameters".equals(expectedName)) {
return matchModes.contains(NONDETERMINISTIC_CONSTRUCTOR_PARAMETERS);
} else if ("nonce".equals(expectedName)) {
return matchModes.contains(NONDETERMINISTIC_NONCE);
} else if ("gas".equals(expectedName) || "gasUsed".equals(expectedName)) {
Expand Down

0 comments on commit ab2e8e9

Please sign in to comment.