1 files changed, 5 insertions, 4 deletions

diff --git a/src/gnunet/service/revocation/service.go b/src/gnunet/service/revocation/service.go
index 3d579e8..99d9b4a 100644
--- a/src/gnunet/service/revocation/service.go
+++ b/src/gnunet/service/revocation/service.go
@@ -27,6 +27,7 @@ import (
         "gnunet/message"
         "gnunet/service"
         "gnunet/transport"
+        "gnunet/util"
 
         "github.com/bfix/gospel/logger"
 )
@@ -47,7 +48,6 @@ func NewService(ctx context.Context, c *core.Core) service.Service {
         srv := &Service{
                 Module: *mod,
         }
-        srv.ProcessFcn = srv.HandleMessage
         return srv
 }
 
@@ -75,7 +75,8 @@ func (s *Service) ServeClient(ctx context.Context, id int, mc *service.Connectio
                 logger.Printf(logger.INFO, "[revocation:%d:%d] Received request: %v\n", id, reqID, msg)
 
                 // handle message
-                s.HandleMessage(context.WithValue(ctx, "label", fmt.Sprintf(":%d:%d", id, reqID)), msg, mc)
+                valueCtx := context.WithValue(ctx, service.CtxKey("label"), fmt.Sprintf(":%d:%d", id, reqID))
+                s.HandleMessage(valueCtx, nil, msg, mc)
         }
         // close client connection
         mc.Close()
@@ -86,11 +87,11 @@ func (s *Service) ServeClient(ctx context.Context, id int, mc *service.Connectio
 }
 
 // Handle a single incoming message
-func (s *Service) HandleMessage(ctx context.Context, msg message.Message, back transport.Responder) bool {
+func (s *Service) HandleMessage(ctx context.Context, sender *util.PeerID, msg message.Message, back transport.Responder) bool {
         // assemble log label
         label := ""
         if v := ctx.Value("label"); v != nil {
-                label = v.(string)
+                label, _ = v.(string)
         }
         switch m := msg.(type) {
         case *message.RevocationQueryMsg: