Shard data type

1 files changed, 9 insertions, 9 deletions

diff --git a/keysafe.hs b/keysafe.hs
index bedca7f..32361ab 100644
--- a/keysafe.hs
+++ b/keysafe.hs
@@ -39,9 +39,9 @@ storedemo = do
 retrievedemo :: IO ()
 retrievedemo = do
 	let sis = shardIdents tunables name keyid
-	shards <- mapM retrieveShard (drop 1 $ getIdents sis)
-	-- TODO: need to try all orders of shards until one works,
-	-- because the shard numbers are not preserved
+	-- we drop 1 to simulate not getting all shards from the servers
+	let l = drop 1 $ zip [1..] (getIdents sis)
+	shards <- mapM (uncurry retrieveShard) l
 	let esk = combineShards tunables shards
 	kek <- genKeyEncryptionKey tunables name password
 	-- TODO: need to solve the encryption puzzle
@@ -54,19 +54,19 @@ retrievedemo = do
 	tunables = testModeTunables -- defaultTunables
 	keyid = KeyId gpgKey "foobar"
 
-storeShard :: StorableObjectIdent -> StorableObject -> IO ()
-storeShard i o = do
+storeShard :: StorableObjectIdent -> Shard -> IO ()
+storeShard i s = do
 	print $ toByteString i
 	fd <- openFd (toByteString i) WriteOnly (Just 0o666)
 		(defaultFileFlags { exclusive = True } )
 	h <- fdToHandle fd
-	B.hPut h (fromStorableObject o)
+	B.hPut h (toByteString s)
 	hClose h
 
-retrieveShard :: StorableObjectIdent -> IO StorableObject
-retrieveShard i = do
+retrieveShard :: Int -> StorableObjectIdent -> IO Shard
+retrieveShard n i = do
 	fd <- openFd (toByteString i) ReadOnly Nothing defaultFileFlags
 	h <- fdToHandle fd
 	b <- B.hGetContents h
 	b `deepseq` hClose h
-	return (StorableObject b)
+	return (Shard n (StorableObject b))