Removed status modification return

diff --git a/src/Data/Syncable.hs b/src/Data/Syncable.hs
index c35b985024e1f73207dbcf326486ae6a47a2c4e6..00cdecdf81649e2e4f381c49be9694b2e86dc4e9 100644 (file)
--- a/src/Data/Syncable.hs
+++ b/src/Data/Syncable.hs
@@ -78,12 +78,11 @@ syncThem :: (Ord k, Show k) =>
             SyncCollection k  -- ^ Present state of master
          -> SyncCollection k  -- ^ Present state of child
          -> SyncCollection k  -- ^ Last state of child
-         -> ([SyncCommand k], [SyncCommand k], [SyncCommand k]) -- ^ Changes to make to (master, child, child state repo)
+         -> ([SyncCommand k], [SyncCommand k]) -- ^ Changes to make to (master, child)
 syncThem masterstate childstate lastchildstate =
-    (masterchanges, childchanges, statuschanges)
+    (masterchanges, childchanges)
     where masterchanges = [] 
           childchanges = map DeleteItem masterToChildDeletes
-          statuschanges = map DeleteItem masterToStatusDeletes
 
 {-
         # Delete local copies of remote messages.  This way,
@@ -96,8 +95,6 @@ syncThem masterstate childstate lastchildstate =
         FIXME: validate logic in situation of new folder here -}
 
           masterToChildDeletes = syncToDelete masterstate childstate
-          masterToStatusDeletes = filterKeys lastchildstate masterToChildDeletes
-
 
 {- | Returns a list of keys that exist in childstate but not in masterstate -}
 syncToDelete :: (Ord k) => 

diff --git a/testsrc/runtests.hs b/testsrc/runtests.hs
index 0c8a1521bd5e37669a493018eabd84134036e652..6ba2995a71e2648c7db69b212ecadb59ea7ad2ee 100644 (file)
--- a/testsrc/runtests.hs
+++ b/testsrc/runtests.hs
@@ -30,21 +30,21 @@ import TestInfrastructure
 
 prop_empty :: Bool
 prop_empty =
-    syncThem emptymap emptymap emptymap == ([], [], []) -- ([DeleteItem 5], [], [])
+    syncThem emptymap emptymap emptymap == ([], []) -- ([DeleteItem 5], [], [])
 
 prop_delAllFromChild :: SyncCollection Int -> Result
 prop_delAllFromChild inp =
-    let (resMaster, resChild, resState) = syncThem emptymap inp inp
+    let (resMaster, resChild) = syncThem emptymap inp inp
         expectedResChild = sort . map DeleteItem . Map.keys $ inp
-        in ([], expectedResChild, expectedResChild) @=? 
-           (resMaster, sort resChild, sort resState)
+        in ([], expectedResChild) @=? 
+           (resMaster, sort resChild)
            
 prop_addFromMaster :: SyncCollection Int -> Result
 prop_addFromMaster inp =
-    let (resMaster, resChild, resState) = syncThem inp emptymap emptymap
+    let (resMaster, resChild) = syncThem inp emptymap emptymap
         expectedResChild = sort . map CopyItem . Map.keys $ inp
-        in ([], expectedResChild, expectedResChild) @=? 
-           (resMaster, sort resChild, sort resState)
+        in ([], expectedResChild) @=? 
+           (resMaster, sort resChild)
 
 allt = [qctest "Empty" prop_empty,
         qctest "Del all from child" prop_delAllFromChild]