Skip to content

Commit 80e28f3

Browse files
authored
chore: let fileio deal in uint8 instead of bv8 (#1347)
1 parent d1c42a6 commit 80e28f3

5 files changed

Lines changed: 4 additions & 17 deletions

File tree

TestVectorsAwsCryptographicMaterialProviders/dafny/KeyVectors/src/Index.dfy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ module {:extern "software.amazon.cryptography.materialproviderstestvectorkeys.in
2727
ensures res.Success? ==>
2828
res.value is KeyVectorsClient
2929
{
30-
var keysManifestBv :- expect FileIO.ReadBytesFromFile(config.keyManifestPath);
31-
var keysManifestBytes := BvToBytes(keysManifestBv);
30+
var keysManifestBytes :- expect FileIO.ReadBytesFromFile(config.keyManifestPath);
3231
var keysManifestJSON :- API.Deserialize(keysManifestBytes)
3332
.MapFailure((e: Errors.DeserializationError) => KeyVectorException(
3433
message := e.ToString()

TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/src/CompleteVectors.dfy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ module {:options "-functionSyntax:4"} CompleteVectors {
161161
method WriteVectorsFile(location: string, bytes: seq<uint8>)
162162
returns (output: Result<(), string>)
163163
{
164-
var bv := JSONHelpers.BytesBv(bytes);
165-
output := FileIO.WriteBytesToFile(location, bv);
164+
output := FileIO.WriteBytesToFile(location, bytes);
166165
}
167166

168167
}

TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/src/JSONHelpers.dfy

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ module {:options "-functionSyntax:4"} JSONHelpers {
1111
import UTF8
1212
import Types = AwsCryptographyMaterialProvidersTypes
1313

14-
function BvToBytes(bits: seq<bv8>): seq<BoundedInts.uint8>
15-
{
16-
seq(|bits|, i requires 0 <= i < |bits| => bits[i] as BoundedInts.byte)
17-
}
18-
19-
function BytesBv(bits: seq<BoundedInts.uint8>): seq<bv8>
20-
{
21-
seq(|bits|, i requires 0 <= i < |bits| => bits[i] as bv8)
22-
}
23-
2414
function Get(key: string, obj: seq<(string, JSON)>)
2515
: (output: Result<Values.JSON, string>)
2616
{

TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/src/TestManifests.dfy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ module {:options "-functionSyntax:4"} TestManifests {
212212
&& fresh(manifestData.value.keys.Modifies)
213213
&& manifestData.value.keys.ValidState()
214214
{
215-
var decryptManifestBv :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
216-
var decryptManifestBytes := BvToBytes(decryptManifestBv);
215+
var decryptManifestBytes :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
217216
var manifestJson :- API.Deserialize(decryptManifestBytes)
218217
.MapFailure(( e: Errors.DeserializationError ) => e.ToString());
219218
:- Need(manifestJson.Object?, "Not a JSON object");

libraries

0 commit comments

Comments
 (0)