diff --git a/installer/windows/Storj/CustomAction.cs b/installer/windows/Storj/CustomAction.cs index 9ab48eadf..7100a43d1 100644 --- a/installer/windows/Storj/CustomAction.cs +++ b/installer/windows/Storj/CustomAction.cs @@ -142,11 +142,6 @@ namespace Storj throw new ArgumentException("File 'ca.cert' not found in the selected folder."); } - if (!fs.File.Exists(Path.Combine(identityDir, "ca.key"))) - { - throw new ArgumentException("File 'ca.key' not found in the selected folder."); - } - if (!fs.File.Exists(Path.Combine(identityDir, "identity.cert"))) { throw new ArgumentException("File 'identity.cert' not found in the selected folder."); diff --git a/installer/windows/StorjTests/ValidateIdentityDirTests.cs b/installer/windows/StorjTests/ValidateIdentityDirTests.cs index 2567f11a3..2158d90b4 100644 --- a/installer/windows/StorjTests/ValidateIdentityDirTests.cs +++ b/installer/windows/StorjTests/ValidateIdentityDirTests.cs @@ -36,20 +36,6 @@ namespace StorjTests { var fs = new MockFileSystem(new Dictionary { - { @"X:\\Some\\Identity\\Folder\\ca.key", new MockFileData("") }, - { @"X:\\Some\\Identity\\Folder\\identity.cert", new MockFileData("") }, - { @"X:\\Some\\Identity\\Folder\\identity.key", new MockFileData("") } - }); - new CustomActionRunner(fs).ValidateIdentityDir("X:\\Some\\Identity\\Folder"); - } - - [TestMethod] - [ExpectedExceptionWithMessage(typeof(ArgumentException), "File 'ca.key' not found in the selected folder.")] - public void MissingCAKeyFile() - { - var fs = new MockFileSystem(new Dictionary - { - { @"X:\\Some\\Identity\\Folder\\ca.cert", new MockFileData("") }, { @"X:\\Some\\Identity\\Folder\\identity.cert", new MockFileData("") }, { @"X:\\Some\\Identity\\Folder\\identity.key", new MockFileData("") } }); @@ -63,7 +49,6 @@ namespace StorjTests var fs = new MockFileSystem(new Dictionary { { @"X:\\Some\\Identity\\Folder\\ca.cert", new MockFileData("") }, - { @"X:\\Some\\Identity\\Folder\\ca.key", new MockFileData("") }, { @"X:\\Some\\Identity\\Folder\\identity.key", new MockFileData("") } }); new CustomActionRunner(fs).ValidateIdentityDir("X:\\Some\\Identity\\Folder"); @@ -76,7 +61,6 @@ namespace StorjTests var fs = new MockFileSystem(new Dictionary { { @"X:\\Some\\Identity\\Folder\\ca.cert", new MockFileData("") }, - { @"X:\\Some\\Identity\\Folder\\ca.key", new MockFileData("") }, { @"X:\\Some\\Identity\\Folder\\identity.cert", new MockFileData("") } }); new CustomActionRunner(fs).ValidateIdentityDir("X:\\Some\\Identity\\Folder"); @@ -88,7 +72,6 @@ namespace StorjTests var fs = new MockFileSystem(new Dictionary { { @"X:\\Some\\Identity\\Folder\\ca.cert", new MockFileData("") }, - { @"X:\\Some\\Identity\\Folder\\ca.key", new MockFileData("") }, { @"X:\\Some\\Identity\\Folder\\identity.cert", new MockFileData("") }, { @"X:\\Some\\Identity\\Folder\\identity.key", new MockFileData("") }, });