Commit 44d91d6c authored by Sietse Ringers's avatar Sietse Ringers
Browse files

Rename irmarequestor package to irmaserver

parent 1b2d8bb2
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"github.com/privacybydesign/irmago/internal/test" "github.com/privacybydesign/irmago/internal/test"
"github.com/privacybydesign/irmago/server" "github.com/privacybydesign/irmago/server"
"github.com/privacybydesign/irmago/server/irmarequestor"
"github.com/privacybydesign/irmago/server/irmaserver" "github.com/privacybydesign/irmago/server/irmaserver"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
...@@ -16,7 +15,7 @@ import ( ...@@ -16,7 +15,7 @@ import (
var ( var (
httpServer *http.Server httpServer *http.Server
irmaServer *irmarequestor.Server irmaServer *irmaserver.Server
combinedServer *irmaserver.Server combinedServer *irmaserver.Server
logger = logrus.New() logger = logrus.New()
...@@ -53,7 +52,7 @@ func StartIrmaClientServer(t *testing.T) { ...@@ -53,7 +52,7 @@ func StartIrmaClientServer(t *testing.T) {
logger.Formatter = &logrus.TextFormatter{} logger.Formatter = &logrus.TextFormatter{}
var err error var err error
irmaServer, err = irmarequestor.New(&server.Configuration{ irmaServer, err = irmaserver.New(&server.Configuration{
URL: "http://localhost:48680", URL: "http://localhost:48680",
Logger: logger, Logger: logger,
SchemesPath: filepath.Join(testdata, "irma_configuration"), SchemesPath: filepath.Join(testdata, "irma_configuration"),
......
...@@ -17,14 +17,14 @@ import ( ...@@ -17,14 +17,14 @@ import (
"github.com/go-errors/errors" "github.com/go-errors/errors"
"github.com/privacybydesign/irmago" "github.com/privacybydesign/irmago"
"github.com/privacybydesign/irmago/server" "github.com/privacybydesign/irmago/server"
"github.com/privacybydesign/irmago/server/irmarequestor" "github.com/privacybydesign/irmago/server/irmaserver"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
type Server struct { type Server struct {
serv, clientserv *http.Server serv, clientserv *http.Server
conf *Configuration conf *Configuration
irmaserv *irmarequestor.Server irmaserv *irmaserver.Server
} }
// Start the server. If successful then it will not return until Stop() is called. // Start the server. If successful then it will not return until Stop() is called.
...@@ -97,7 +97,7 @@ func (s *Server) Stop() error { ...@@ -97,7 +97,7 @@ func (s *Server) Stop() error {
} }
func New(config *Configuration) (*Server, error) { func New(config *Configuration) (*Server, error) {
irmaserv, err := irmarequestor.New(config.Configuration) irmaserv, err := irmaserver.New(config.Configuration)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// IRMA sessions with irmaclient instances (i.e. the IRMA app). It // IRMA sessions with irmaclient instances (i.e. the IRMA app). It
// exposes functions for handling IRMA sessions and a HTTP handler // exposes functions for handling IRMA sessions and a HTTP handler
// that handles the sessions with the irmaclient. // that handles the sessions with the irmaclient.
package irmarequestor package irmaserver
import ( import (
"io/ioutil" "io/ioutil"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment