diff --git a/ProjectPlugins/CodexClient/CodexTypes.cs b/ProjectPlugins/CodexClient/CodexTypes.cs index f9a0d9d2..12e7c92c 100644 --- a/ProjectPlugins/CodexClient/CodexTypes.cs +++ b/ProjectPlugins/CodexClient/CodexTypes.cs @@ -66,7 +66,7 @@ namespace CodexClient public class Manifest { public string RootHash { get; set; } = string.Empty; - public ByteSize OriginalBytes { get; set; } = ByteSize.Zero; + public ByteSize DatasetSize { get; set; } = ByteSize.Zero; public ByteSize BlockSize { get; set; } = ByteSize.Zero; public bool Protected { get; set; } } diff --git a/ProjectPlugins/CodexClient/Mapper.cs b/ProjectPlugins/CodexClient/Mapper.cs index 35f872ef..69d586f8 100644 --- a/ProjectPlugins/CodexClient/Mapper.cs +++ b/ProjectPlugins/CodexClient/Mapper.cs @@ -208,7 +208,7 @@ namespace CodexClient return new Manifest { BlockSize = new ByteSize(Convert.ToInt64(manifest.BlockSize)), - OriginalBytes = new ByteSize(Convert.ToInt64(manifest.DatasetSize)), + DatasetSize = new ByteSize(Convert.ToInt64(manifest.DatasetSize)), RootHash = manifest.TreeCid, Protected = manifest.Protected }; diff --git a/Tests/CodexReleaseTests/DataTests/LocalFilesTest.cs b/Tests/CodexReleaseTests/DataTests/LocalFilesTest.cs index 4069aa49..8a69c834 100644 --- a/Tests/CodexReleaseTests/DataTests/LocalFilesTest.cs +++ b/Tests/CodexReleaseTests/DataTests/LocalFilesTest.cs @@ -33,9 +33,9 @@ namespace CodexReleaseTests.DataTests var local2 = localFiles.Content.Single(f => f.Cid == cid2); Assert.That(local1.Manifest.Protected, Is.False); - Assert.That(local1.Manifest.OriginalBytes, Is.EqualTo(size1)); + Assert.That(local1.Manifest.DatasetSize, Is.EqualTo(size1)); Assert.That(local2.Manifest.Protected, Is.False); - Assert.That(local2.Manifest.OriginalBytes, Is.EqualTo(size2)); + Assert.That(local2.Manifest.DatasetSize, Is.EqualTo(size2)); } } } diff --git a/Tests/CodexReleaseTests/DataTests/ManifestOnlyDownloadTest.cs b/Tests/CodexReleaseTests/DataTests/ManifestOnlyDownloadTest.cs index c55b3f8f..f1fcc84c 100644 --- a/Tests/CodexReleaseTests/DataTests/ManifestOnlyDownloadTest.cs +++ b/Tests/CodexReleaseTests/DataTests/ManifestOnlyDownloadTest.cs @@ -27,7 +27,7 @@ namespace CodexReleaseTests.DataTests Assert.That(spaceDiff, Is.LessThan(64.KB().SizeInBytes)); Assert.That(localDataset.Cid, Is.EqualTo(cid)); - Assert.That(localDataset.Manifest.OriginalBytes.SizeInBytes, Is.EqualTo(file.GetFilesize().SizeInBytes)); + Assert.That(localDataset.Manifest.DatasetSize.SizeInBytes, Is.EqualTo(file.GetFilesize().SizeInBytes)); } } } diff --git a/Tests/CodexReleaseTests/DataTests/StreamlessDownloadTest.cs b/Tests/CodexReleaseTests/DataTests/StreamlessDownloadTest.cs index d53d16dc..93b89f19 100644 --- a/Tests/CodexReleaseTests/DataTests/StreamlessDownloadTest.cs +++ b/Tests/CodexReleaseTests/DataTests/StreamlessDownloadTest.cs @@ -22,7 +22,7 @@ namespace CodexReleaseTests.DataTests var localDataset = downloader.DownloadStreamlessWait(cid, size); Assert.That(localDataset.Cid, Is.EqualTo(cid)); - Assert.That(localDataset.Manifest.OriginalBytes.SizeInBytes, Is.EqualTo(file.GetFilesize().SizeInBytes)); + Assert.That(localDataset.Manifest.DatasetSize.SizeInBytes, Is.EqualTo(file.GetFilesize().SizeInBytes)); // Stop the uploader node and verify that the downloader has the data. uploader.Stop(waitTillStopped: true); diff --git a/Tools/BiblioTech/CodexChecking/CodexTwoWayChecker.cs b/Tools/BiblioTech/CodexChecking/CodexTwoWayChecker.cs index ac83ccd9..1dc6b681 100644 --- a/Tools/BiblioTech/CodexChecking/CodexTwoWayChecker.cs +++ b/Tools/BiblioTech/CodexChecking/CodexTwoWayChecker.cs @@ -163,7 +163,7 @@ namespace BiblioTech.CodexChecking private bool IsManifestLengthCompatible(ICheckResponseHandler handler, TransferCheck check, Manifest manifest) { var dataLength = check.UniqueData.Length; - var manifestLength = manifest.OriginalBytes.SizeInBytes; + var manifestLength = manifest.DatasetSize.SizeInBytes; Log($"Checking manifest length: dataLength={dataLength},manifestLength={manifestLength}");