rename fields

2 files changed, 10 insertions, 9 deletions

diff --git a/Role/Developer.hs b/Role/Developer.hs
index d6cbf2b..e3d4a8c 100644
--- a/Role/Developer.hs
+++ b/Role/Developer.hs
@@ -47,7 +47,8 @@ data DeveloperState = DeveloperState
 	, enteredSince :: [Hash]
 	, lastActivity :: Hash
 	, developerSessionKey :: MySessionKey
-	, developerSigVerifier :: SigVerifier
+	, userSigVerifier :: SigVerifier
+	-- ^ Used to verify signatures on messages from the user.
 	}
 
 -- | Read things typed by the developer, and forward them to the TMChan.
@@ -154,7 +155,7 @@ getServerMessage ochan devstate = do
 		Just (User msg) -> do
 			ds <- readTVar devstate
 			-- Check user's signature before doing anything else.
-			if verifySigned (developerSigVerifier ds) msg
+			if verifySigned (userSigVerifier ds) msg
 				then do
 					o <- processuser ds msg
 					return (Just (o, User msg))
@@ -262,6 +263,6 @@ processSessionStart ochan logger = do
 		, enteredSince = mempty
 		, lastActivity = starthash
 		, developerSessionKey = sk
-		, developerSigVerifier = sigverifier
+		, userSigVerifier = sigverifier
 		}
 	return (st, output)
diff --git a/Role/User.hs b/Role/User.hs
index 94625c2..7a1c01c 100644
--- a/Role/User.hs
+++ b/Role/User.hs
@@ -69,7 +69,7 @@ type Backlog = NonEmpty Log
 data UserState = UserState
 	{ backLog :: Backlog
 	, userSessionKey :: MySessionKey
-	, userSigVerifier :: SigVerifier
+	, sigVerifier :: SigVerifier
 	}
 
 -- | Start by establishing our session key, and displaying the starttxt.
@@ -92,7 +92,7 @@ startProtocol starttxt ochan logger = do
 	newTVarIO $ UserState
 		{ backLog = l :| []
 		, userSessionKey = sk
-		, userSigVerifier = mempty
+		, sigVerifier = mempty
 		}
 
 -- | Forward things the user types to the Pty.
@@ -206,7 +206,7 @@ getDeveloperMessage' msg ochan us now = do
 			if verifySigned sigverifier msg
 				then return (InputMessage msg)
 				else return (BadlySignedMessage msg)
-		_ -> if verifySigned (userSigVerifier st) msg
+		_ -> if verifySigned (sigVerifier st) msg
 			then case msg of
 				ActivityMessage entered -> do
 					-- Don't need to retain backlog
@@ -227,16 +227,16 @@ getDeveloperMessage' msg ochan us now = do
 			else return (BadlySignedMessage msg)
 
 -- | Check if the public key a developer presented is one we want to use,
--- and if so, add it to the userSigVerifier.
+-- and if so, add it to the sigVerifier.
 checkDeveloperPublicKey :: TMChan (Message Seen) -> TVar UserState -> Logger -> PublicKey -> IO ()
 checkDeveloperPublicKey ochan us logger pk = do
 	now <- getPOSIXTime
 	-- TODO check gpg sig..
 	msg <- atomically $ do
 		st <- readTVar us
-		let sv = userSigVerifier st
+		let sv = sigVerifier st
 		let sv' = sv `mappend` mkSigVerifier pk
-		let st' = st { userSigVerifier = sv' }
+		let st' = st { sigVerifier = sv' }
 		writeTVar us st'
 		sendDeveloper ochan us (SessionKeyAccepted pk) now
 	logger $ User msg