refactor: move revocation handlers

internal/servercore/api.go

@@ -549,35 +549,3 @@ func (s *Server) handleRevocationMessage(
 
 	return server.JsonResponse(nil, server.RemoteError(server.ErrorInvalidRequest, ""))
 }
-
-func (s *Server) handlePostRevocationRecords(
-	cred irma.CredentialTypeIdentifier, records []*revocation.Record,
-) (interface{}, *irma.RemoteError) {
-	db, err := s.conf.IrmaConfiguration.RevocationDB(cred)
-	if err != nil {
-		return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
-	}
-	for _, r := range records {
-		if err = db.Add(r.Message, r.PublicKeyIndex); err != nil {
-			return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
-		}
-	}
-	return nil, nil
-}
-
-func (s *Server) handleGetRevocationRecords(
-	cred irma.CredentialTypeIdentifier, index int,
-) ([]*revocation.Record, *irma.RemoteError) {
-	if _, ok := s.conf.RevocationServers[cred]; ok {
-		return nil, server.RemoteError(server.ErrorInvalidRequest, "not supported by this server")
-	}
-	db, err := s.conf.IrmaConfiguration.RevocationDB(cred)
-	if err != nil {
-		return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
-	}
-	records, err := db.RevocationRecords(index)
-	if err != nil {
-		return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
-	}
-	return records, nil
-}

internal/servercore/handle.go

@@ -235,3 +235,35 @@ func (session *session) handlePostCommitments(commitments *irma.IssueCommitmentM
 	session.setStatus(server.StatusDone)
 	return sigs, nil
 }
+
+func (s *Server) handlePostRevocationRecords(
+	cred irma.CredentialTypeIdentifier, records []*revocation.Record,
+) (interface{}, *irma.RemoteError) {
+	db, err := s.conf.IrmaConfiguration.RevocationDB(cred)
+	if err != nil {
+		return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
+	}
+	for _, r := range records {
+		if err = db.Add(r.Message, r.PublicKeyIndex); err != nil {
+			return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
+		}
+	}
+	return nil, nil
+}
+
+func (s *Server) handleGetRevocationRecords(
+	cred irma.CredentialTypeIdentifier, index int,
+) ([]*revocation.Record, *irma.RemoteError) {
+	if _, ok := s.conf.RevocationServers[cred]; ok {
+		return nil, server.RemoteError(server.ErrorInvalidRequest, "not supported by this server")
+	}
+	db, err := s.conf.IrmaConfiguration.RevocationDB(cred)
+	if err != nil {
+		return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
+	}
+	records, err := db.RevocationRecords(index)
+	if err != nil {
+		return nil, server.RemoteError(server.ErrorUnknown, err.Error()) // TODO error type
+	}
+	return records, nil
+}

internal/sessiontest/server_test.go

@@ -60,9 +60,6 @@ func StartIrmaServer(t *testing.T, updatedIrmaConf bool) {
 		Logger:         logger,
 		SchemesPath:    filepath.Join(testdata, irmaconf),
 		RevocationPath: filepath.Join(testdata, "storage", "revocation"),
-		RevocationServers: map[irma.CredentialTypeIdentifier]server.RevocationServer{
-			irma.NewCredentialTypeIdentifier("irma-demo.MijnOverheid.root"): {},
-		},
 	})
 
 	require.NoError(t, err)