Rename irmarequestor package to irmaserver

internal/sessiontest/server_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/privacybydesign/irmago/internal/test"
 	"github.com/privacybydesign/irmago/server"
-	"github.com/privacybydesign/irmago/server/irmarequestor"
 	"github.com/privacybydesign/irmago/server/irmaserver"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
@@ -16,7 +15,7 @@ import (
 
 var (
 	httpServer     *http.Server
-	irmaServer     *irmarequestor.Server
+	irmaServer     *irmaserver.Server
 	combinedServer *irmaserver.Server
 
 	logger   = logrus.New()
@@ -53,7 +52,7 @@ func StartIrmaClientServer(t *testing.T) {
 	logger.Formatter = &logrus.TextFormatter{}
 
 	var err error
-	irmaServer, err = irmarequestor.New(&server.Configuration{
+	irmaServer, err = irmaserver.New(&server.Configuration{
 		URL:                   "http://localhost:48680",
 		Logger:                logger,
 		SchemesPath:           filepath.Join(testdata, "irma_configuration"),

server/irmad/server.go

@@ -17,14 +17,14 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/privacybydesign/irmago"
 	"github.com/privacybydesign/irmago/server"
-	"github.com/privacybydesign/irmago/server/irmarequestor"
+	"github.com/privacybydesign/irmago/server/irmaserver"
 	"github.com/sirupsen/logrus"
 )
 
 type Server struct {
 	serv, clientserv *http.Server
 	conf             *Configuration
-	irmaserv         *irmarequestor.Server
+	irmaserv         *irmaserver.Server
 }
 
 // Start the server. If successful then it will not return until Stop() is called.
@@ -97,7 +97,7 @@ func (s *Server) Stop() error {
 }
 
 func New(config *Configuration) (*Server, error) {
-	irmaserv, err := irmarequestor.New(config.Configuration)
+	irmaserv, err := irmaserver.New(config.Configuration)
 	if err != nil {
 		return nil, err
 	}

server/irmarequestor/main.go → server/irmaserver/main.go

@@ -3,7 +3,7 @@
 // IRMA sessions with irmaclient instances (i.e. the IRMA app). It
 // exposes functions for handling IRMA sessions and a HTTP handler
 // that handles the sessions with the irmaclient.
-package irmarequestor
+package irmaserver
 
 import (
 	"io/ioutil"