From 93a4cd46b4c93bf1b7daff372b1bc3a13cc28618 Mon Sep 17 00:00:00 2001 From: Robin Salkeld Date: Thu, 16 May 2024 18:01:55 -0700 Subject: [PATCH 1/2] Move InternalResult into StandardLibrary(Internal) --- .../java/src/main/java/Digest_Compile/ExternDigest.java | 2 +- .../runtimes/java/src/main/java/Signature/ECDSA.java | 2 +- .../runtimes/java/src/main/java/Signature/PrivateKeyUtils.java | 2 +- .../runtimes/java/src/main/java/Signature/PublicKeyUtils.java | 2 +- .../java/src/main/java/Signature/SignatureAlgorithm.java | 2 +- .../src/main/java/StandardLibraryInternal}/InternalResult.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename {AwsCryptographyPrimitives/runtimes/java/src/main/java/Dafny/Aws/Cryptography/Primitives/Types => StandardLibrary/runtimes/java/src/main/java/StandardLibraryInternal}/InternalResult.java (96%) diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java index d3d1b36a6..dd5986719 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java @@ -1,6 +1,6 @@ package Digest_Compile; -import Dafny.Aws.Cryptography.Primitives.Types.InternalResult; +import StandardLibraryInternal.InternalResult; import ExternDigest._ExternBase___default; import Wrappers_Compile.Result; import dafny.Array; diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java index 5eac61993..ca1e1951c 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java @@ -2,7 +2,7 @@ import static Signature.SignatureAlgorithm.signatureAlgorithm; -import Dafny.Aws.Cryptography.Primitives.Types.InternalResult; +import StandardLibraryInternal.InternalResult; import Digest_Compile.ExternDigest; import Random_Compile.ExternRandom; import Wrappers_Compile.Result; diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PrivateKeyUtils.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PrivateKeyUtils.java index 9d62ddffa..41db2de60 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PrivateKeyUtils.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PrivateKeyUtils.java @@ -1,6 +1,6 @@ package Signature; -import Dafny.Aws.Cryptography.Primitives.Types.InternalResult; +import StandardLibraryInternal.InternalResult; import Wrappers_Compile.Result; import dafny.Array; import dafny.DafnySequence; diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PublicKeyUtils.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PublicKeyUtils.java index be6054a07..d8c60fac5 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PublicKeyUtils.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/PublicKeyUtils.java @@ -6,7 +6,7 @@ import static java.math.BigInteger.ONE; import static java.math.BigInteger.ZERO; -import Dafny.Aws.Cryptography.Primitives.Types.InternalResult; +import StandardLibraryInternal.InternalResult; import Wrappers_Compile.Result; import dafny.Array; import dafny.DafnySequence; diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/SignatureAlgorithm.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/SignatureAlgorithm.java index ec5c64057..cb1940e65 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/SignatureAlgorithm.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/SignatureAlgorithm.java @@ -4,7 +4,7 @@ import static Signature.ECDSA.SEC_P384; import static Signature.ECDSA.SEC_PRIME_FIELD_PREFIX; -import Dafny.Aws.Cryptography.Primitives.Types.InternalResult; +import StandardLibraryInternal.InternalResult; import Wrappers_Compile.Result; import java.security.AlgorithmParameters; import java.security.NoSuchAlgorithmException; diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Dafny/Aws/Cryptography/Primitives/Types/InternalResult.java b/StandardLibrary/runtimes/java/src/main/java/StandardLibraryInternal/InternalResult.java similarity index 96% rename from AwsCryptographyPrimitives/runtimes/java/src/main/java/Dafny/Aws/Cryptography/Primitives/Types/InternalResult.java rename to StandardLibrary/runtimes/java/src/main/java/StandardLibraryInternal/InternalResult.java index 273822ef4..d43f426b4 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Dafny/Aws/Cryptography/Primitives/Types/InternalResult.java +++ b/StandardLibrary/runtimes/java/src/main/java/StandardLibraryInternal/InternalResult.java @@ -1,4 +1,4 @@ -package Dafny.Aws.Cryptography.Primitives.Types; +package StandardLibraryInternal; /** * Similar to the translation of Dafny's Wrappers.Result type, From 8978c2851bb030c5158400f02a0d53f1ade68ece Mon Sep 17 00:00:00 2001 From: Robin Salkeld Date: Thu, 16 May 2024 19:30:47 -0700 Subject: [PATCH 2/2] chore: Move InternalResult into StandardLibrary(Internal) --- .../java/src/main/java/Digest_Compile/ExternDigest.java | 2 +- .../runtimes/java/src/main/java/Signature/ECDSA.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java index dd5986719..b16addd44 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Digest_Compile/ExternDigest.java @@ -1,7 +1,7 @@ package Digest_Compile; -import StandardLibraryInternal.InternalResult; import ExternDigest._ExternBase___default; +import StandardLibraryInternal.InternalResult; import Wrappers_Compile.Result; import dafny.Array; import dafny.DafnySequence; diff --git a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java index ca1e1951c..50a5f421d 100644 --- a/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java +++ b/AwsCryptographyPrimitives/runtimes/java/src/main/java/Signature/ECDSA.java @@ -2,9 +2,9 @@ import static Signature.SignatureAlgorithm.signatureAlgorithm; -import StandardLibraryInternal.InternalResult; import Digest_Compile.ExternDigest; import Random_Compile.ExternRandom; +import StandardLibraryInternal.InternalResult; import Wrappers_Compile.Result; import dafny.Array; import dafny.DafnySequence;