Revert "Add RST support in Sandbox (#2917)"

core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java

@@ -108,8 +108,7 @@ public EppResponse run() throws EppException {
           verifyClaimsPeriodNotEnded(tld, now);
         }
       }
-      Optional<String> claimKey =
-          ClaimsListDao.get(tldStr).getClaimKey(parsedDomain.parts().get(0));
+      Optional<String> claimKey = ClaimsListDao.get().getClaimKey(parsedDomain.parts().get(0));
       launchChecksBuilder.add(
           LaunchCheck.create(
               LaunchCheckName.create(claimKey.isPresent(), domainName), claimKey.orElse(null)));

core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java

@@ -279,7 +279,7 @@ public EppResponse run() throws EppException {
       checkAllowedAccessToTld(registrarId, tld.getTldStr());
       checkHasBillingAccount(registrarId, tld.getTldStr());
       boolean isValidReservedCreate = isValidReservedCreate(domainName, allocationToken);
-      ClaimsList claimsList = ClaimsListDao.get(tld.getTldStr());
+      ClaimsList claimsList = ClaimsListDao.get();
       verifyIsGaOrSpecialCase(
           tld,
           claimsList,
@@ -311,8 +311,7 @@ public EppResponse run() throws EppException {
       // at this point so that we can verify it before the "after validation" extension point.
       signedMarkId =
           tmchUtils
-              .verifySignedMarks(
-                  tld.getTldStr(), launchCreate.get().getSignedMarks(), domainLabel, now)
+              .verifySignedMarks(launchCreate.get().getSignedMarks(), domainLabel, now)
               .getId();
     }
     verifyNotBlockedByBsa(domainName, tld, now, allocationToken);

core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java

@@ -55,16 +55,15 @@ public DomainFlowTmchUtils(TmchXmlSignature tmchXmlSignature) {
   }
 
   public SignedMark verifySignedMarks(
-      String tld, ImmutableList<AbstractSignedMark> signedMarks, String domainLabel, DateTime now)
+      ImmutableList<AbstractSignedMark> signedMarks, String domainLabel, DateTime now)
       throws EppException {
     if (signedMarks.size() > 1) {
       throw new TooManySignedMarksException();
     }
     if (!(signedMarks.get(0) instanceof EncodedSignedMark)) {
       throw new SignedMarksMustBeEncodedException();
     }
-    SignedMark signedMark =
-        verifyEncodedSignedMark(tld, (EncodedSignedMark) signedMarks.get(0), now);
+    SignedMark signedMark = verifyEncodedSignedMark((EncodedSignedMark) signedMarks.get(0), now);
     return verifySignedMarkValidForDomainLabel(signedMark, domainLabel);
   }
 
@@ -76,9 +75,8 @@ public SignedMark verifySignedMarkValidForDomainLabel(SignedMark signedMark, Str
     return signedMark;
   }
 
-  // TODO(b/412715713): remove the tld parameter when RST completes.
-  public SignedMark verifyEncodedSignedMark(
-      String tld, EncodedSignedMark encodedSignedMark, DateTime now) throws EppException {
+  public SignedMark verifyEncodedSignedMark(EncodedSignedMark encodedSignedMark, DateTime now)
+      throws EppException {
     if (!encodedSignedMark.getEncoding().equals("base64")) {
       throw new Base64RequiredForEncodedSignedMarksException();
     }
@@ -96,7 +94,7 @@ public SignedMark verifyEncodedSignedMark(
       throw new SignedMarkParsingErrorException();
     }
 
-    if (SignedMarkRevocationList.get(tld).isSmdRevoked(signedMark.getId(), now)) {
+    if (SignedMarkRevocationList.get().isSmdRevoked(signedMark.getId(), now)) {
       throw new SignedMarkRevokedErrorException();
     }
 

core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java

@@ -21,7 +21,6 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import google.registry.model.ImmutableObject;
-import google.registry.tmch.RstTmchUtils;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -72,11 +71,6 @@ public static SignedMarkRevocationList get() {
     return CACHE.get();
   }
 
-  // TODO(b/412715713): remove the tld parameter when RST completes.
-  public static SignedMarkRevocationList get(String tld) {
-    return RstTmchUtils.getSmdrList(tld).orElseGet(SignedMarkRevocationList::get);
-  }
-
   /** Create a new {@link SignedMarkRevocationList} without saving it. */
   public static SignedMarkRevocationList create(
       DateTime creationTime, ImmutableMap<String, DateTime> revokes) {

core/src/main/java/google/registry/model/tmch/ClaimsListDao.java

@@ -22,7 +22,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import google.registry.model.CacheUtils;
-import google.registry.tmch.RstTmchUtils;
 import java.time.Duration;
 import java.util.Optional;
 
@@ -73,11 +72,6 @@ public static ClaimsList get() {
     return CACHE.get(ClaimsListDao.class);
   }
 
-  // TODO(b/412715713): remove the tld parameter when RST completes.
-  public static ClaimsList get(String tld) {
-    return RstTmchUtils.getClaimsList(tld).orElseGet(ClaimsListDao::get);
-  }
-
   /**
    * Returns the most recent revision of the {@link ClaimsList} in SQL or an empty list if it
    * doesn't exist.