From 14e2eefc4298929160437f8aa4d6583dce0ebf4a Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Mon, 25 Feb 2019 12:29:45 -0800
Subject: [PATCH] Updates Harmony dependency

---
 Delta/Launch/LaunchViewController.swift       |  2 +-
 .../GameSyncStatusViewController.swift        |  4 ++--
 .../RecordVersionsViewController.swift        |  4 ++--
 .../SyncingServicesViewController.swift       |  4 ++--
 Delta/Syncing/SyncResultViewController.swift  | 24 +++++++------------
 External/Harmony                              |  2 +-
 6 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/Delta/Launch/LaunchViewController.swift b/Delta/Launch/LaunchViewController.swift
index 95f34d4..4786ff5 100644
--- a/Delta/Launch/LaunchViewController.swift
+++ b/Delta/Launch/LaunchViewController.swift
@@ -66,7 +66,7 @@ extension LaunchViewController
                 switch result
                 {
                 case .success: completionHandler(nil)
-                case .failure(let error): completionHandler(error.error)
+                case .failure(let error): completionHandler(error)
                 }
             }
         }
diff --git a/Delta/Settings/Syncing/GameSyncStatusViewController.swift b/Delta/Settings/Syncing/GameSyncStatusViewController.swift
index 45a05d6..6cffbdc 100644
--- a/Delta/Settings/Syncing/GameSyncStatusViewController.swift
+++ b/Delta/Settings/Syncing/GameSyncStatusViewController.swift
@@ -53,7 +53,7 @@ class GameSyncStatusViewController: UITableViewController
         
         guard let cell = sender as? UITableViewCell, let indexPath = self.tableView.indexPath(for: cell) else { return }
         
-        let recordedObject = self.dataSource.item(at: indexPath) as! SyncableManagedObject
+        let recordedObject = self.dataSource.item(at: indexPath) as! Syncable
         
         do
         {
@@ -136,7 +136,7 @@ private extension GameSyncStatusViewController
         
         do
         {
-            let recordedObjects = ([self.game, self.game.gameSave].compactMap { $0 } + Array(self.game.saveStates) + Array(self.game.cheats)) as! [SyncableManagedObject]
+            let recordedObjects = ([self.game, self.game.gameSave].compactMap { $0 } + Array(self.game.saveStates) + Array(self.game.cheats)) as! [Syncable]
             let records = try SyncManager.shared.recordController.fetchRecords(for: recordedObjects)
             
             for record in records
diff --git a/Delta/Settings/Syncing/RecordVersionsViewController.swift b/Delta/Settings/Syncing/RecordVersionsViewController.swift
index 4013466..1fd6bc0 100644
--- a/Delta/Settings/Syncing/RecordVersionsViewController.swift
+++ b/Delta/Settings/Syncing/RecordVersionsViewController.swift
@@ -199,7 +199,7 @@ private extension RecordVersionsViewController
         SyncManager.shared.syncCoordinator.fetchVersions(for: self.record) { (result) in
             do
             {
-                let versions = try result.value().map(Version.init)
+                let versions = try result.get().map(Version.init)
                 self.versions = versions
                 
                 DispatchQueue.main.async {
@@ -267,7 +267,7 @@ private extension RecordVersionsViewController
                 
                 do
                 {
-                    let record = try result.value()
+                    let record = try result.get()
                     self.record = record
                     
                     self.progressView.setProgress(1.0, animated: true)
diff --git a/Delta/Settings/Syncing/SyncingServicesViewController.swift b/Delta/Settings/Syncing/SyncingServicesViewController.swift
index 8e3f591..b3aa76f 100644
--- a/Delta/Settings/Syncing/SyncingServicesViewController.swift
+++ b/Delta/Settings/Syncing/SyncingServicesViewController.swift
@@ -114,7 +114,7 @@ extension SyncingServicesViewController
                     DispatchQueue.main.async {
                         do
                         {
-                            try result.verify()
+                            try result.get()
                             self.tableView.reloadData()
                         }
                         catch
@@ -131,7 +131,7 @@ extension SyncingServicesViewController
                     DispatchQueue.main.async {
                         do
                         {
-                            try result.verify()
+                            _ = try result.get()
                             self.tableView.reloadData()
                         }
                         catch
diff --git a/Delta/Syncing/SyncResultViewController.swift b/Delta/Syncing/SyncResultViewController.swift
index c90d5b4..0df9bfe 100644
--- a/Delta/Syncing/SyncResultViewController.swift
+++ b/Delta/Syncing/SyncResultViewController.swift
@@ -170,32 +170,24 @@ private extension SyncResultViewController
     {
         var errors = [Error]()
         
-        do
-        {
-            try self.result.verify()
-        }
-        catch SyncError.partial(let recordResults)
+        switch self.result!
         {
+        case .success: break
+        case .failure(.partial(let recordResults)):
             for (_, result) in recordResults
             {
                 guard case .failure(let error) = result else { continue }
                 errors.append(error)
             }
-        }
-        catch SyncError.other(.cancelled)
-        {
+        
+        case .failure(.other(GeneralError.cancelled)):
             // Do nothing
-        }
-        catch let error as SyncError
-        {
+            break
+            
+        case .failure(let error):
             let error = error.underlyingError ?? error
             errors.append(error)
         }
-        catch
-        {
-            assertionFailure("Non-SyncError thrown by sync result.")
-            errors.append(error)
-        }
         
         var errorsByGroup = [Group: [Error]]()
         
diff --git a/External/Harmony b/External/Harmony
index 31b5647..d3d5a3c 160000
--- a/External/Harmony
+++ b/External/Harmony
@@ -1 +1 @@
-Subproject commit 31b5647ed3cd40ea91cedffdbcb566abb459f617
+Subproject commit d3d5a3c8e6c9d584802e233856733afaac3bc58e