symbole cleaning in session package

ChristianMct · Apr 17, 2024 · 2d7c77c · 2d7c77c
1 parent 89635ac
commit 2d7c77c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/node/node.go b/node/node.go
@@ -325,14 +325,14 @@ func (node *Node) IsHelperNode() bool {
 // SessionProvider interface implementation
 
 // GetSessionFromID returns the session with the given ID.
-func (node *Node) GetSessionFromID(sessionID session.SessionID) (*session.Session, bool) {
+func (node *Node) GetSessionFromID(sessionID session.ID) (*session.Session, bool) {
 	return node.sessions.GetSessionFromID(sessionID)
 }
 
 // GetSessionFromContext returns the session by extracting the session id from the
 // provided context.
 func (node *Node) GetSessionFromContext(ctx context.Context) (*session.Session, bool) {
-	sessID, has := session.SessionIDFromContext(ctx)
+	sessID, has := session.IDFromContext(ctx)
 	if !has {
 		return nil, false
 	}

diff --git a/services/compute/service.go b/services/compute/service.go
@@ -763,7 +763,7 @@ func (s *Service) PutCiphertext(ctx context.Context, ct session.Ciphertext) erro
 
 	_, exists := s.sessions.GetSessionFromContext(ctx)
 	if !exists {
-		sessid, _ := session.SessionIDFromContext(ctx)
+		sessid, _ := session.IDFromContext(ctx)
 		return fmt.Errorf("invalid session id \"%s\"", sessid)
 	}
 

diff --git a/services/setup/resultbackend.go b/services/setup/resultbackend.go
@@ -21,7 +21,7 @@ func newObjStoreResultBackend(os objectstore.ObjectStore) *objStoreResultBackend
 
 func (osrb objStoreResultBackend) Has(ctx context.Context, sig protocol.Signature) (has bool, err error) {
 
-	sessid, has := session.SessionIDFromContext(ctx)
+	sessid, has := session.IDFromContext(ctx)
 	if !has {
 		return false, fmt.Errorf("session id not found in context")
 	}
@@ -39,7 +39,7 @@ func (osrb objStoreResultBackend) Has(ctx context.Context, sig protocol.Signatur
 
 func (osrb objStoreResultBackend) Put(ctx context.Context, pd protocol.Descriptor, aggShare protocol.Share) error {
 
-	sessid, has := session.SessionIDFromContext(ctx)
+	sessid, has := session.IDFromContext(ctx)
 	if !has {
 		return fmt.Errorf("session id not found in context")
 	}
@@ -54,7 +54,7 @@ func (osrb objStoreResultBackend) Put(ctx context.Context, pd protocol.Descripto
 }
 
 func (osrb objStoreResultBackend) GetShare(ctx context.Context, sig protocol.Signature, share protocol.LattigoShare) (err error) { // TODO: replace by binary unmasharller and remove interface
-	sessid, has := session.SessionIDFromContext(ctx)
+	sessid, has := session.IDFromContext(ctx)
 	if !has {
 		return fmt.Errorf("session id not found in context")
 	}
@@ -64,7 +64,7 @@ func (osrb objStoreResultBackend) GetShare(ctx context.Context, sig protocol.Sig
 }
 
 func (osrb objStoreResultBackend) GetProtocolDesc(ctx context.Context, sig protocol.Signature) (pd *protocol.Descriptor, err error) {
-	sessid, has := session.SessionIDFromContext(ctx)
+	sessid, has := session.IDFromContext(ctx)
 	if !has {
 		return nil, fmt.Errorf("session id not found in context")
 	}

diff --git a/session/context.go b/session/context.go
@@ -17,7 +17,7 @@ var (
 )
 
 // NewContext returns a new context derived from ctx with the given session and circuit IDs.
-func NewContext(ctx context.Context, sessID SessionID, circID ...CircuitID) context.Context {
+func NewContext(ctx context.Context, sessID ID, circID ...CircuitID) context.Context {
 	ctx = context.WithValue(ctx, CtxSessionID, sessID)
 	if len(circID) != 0 {
 		ctx = ContextWithCircuitID(ctx, circID[0])
@@ -27,7 +27,7 @@ func NewContext(ctx context.Context, sessID SessionID, circID ...CircuitID) cont
 
 // NewBackgroundContext returns a new context derived from context.Background with
 // the given session and circuit IDs.
-func NewBackgroundContext(sessID SessionID, circID ...CircuitID) context.Context {
+func NewBackgroundContext(sessID ID, circID ...CircuitID) context.Context {
 	return NewContext(context.Background(), sessID, circID...)
 }
 
@@ -47,9 +47,9 @@ func NodeIDFromContext(ctx context.Context) (NodeID, bool) {
 	return nid, ok
 }
 
-// SessionIDFromContext returns the session ID from the context.
-func SessionIDFromContext(ctx context.Context) (SessionID, bool) {
-	sessID, ok := ctx.Value(CtxSessionID).(SessionID)
+// IDFromContext returns the session ID from the context.
+func IDFromContext(ctx context.Context) (ID, bool) {
+	sessID, ok := ctx.Value(CtxSessionID).(ID)
 	return sessID, ok
 }
 

diff --git a/session/session.go b/session/session.go
@@ -22,8 +22,8 @@ type FHEParameters interface { // TODO: Lattigo could have a common interface fo
 // NodeID is the unique identifier of a node.
 type NodeID string
 
-// SessionID is the unique identifier of a session.
-type SessionID string
+// ID is the unique identifier of a session.
+type ID string
 
 // CircuitID is the unique identifier of a running circuit.
 type CircuitID string
@@ -52,7 +52,7 @@ type FHEParamerersLiteralProvider interface {
 
 // Parameters contains data used to initialize a Session.
 type Parameters struct {
-	ID            SessionID
+	ID            ID
 	Nodes         []NodeID
 	FHEParameters FHEParamerersLiteralProvider
 	Threshold     int
@@ -249,15 +249,15 @@ func (sess *Session) Contains(nodeID NodeID) bool {
 	return utils.NewSet(sess.Nodes).Contains(nodeID)
 }
 
-func (sess *Session) GetSessionFromID(sessionID SessionID) (*Session, bool) {
+func (sess *Session) GetSessionFromID(sessionID ID) (*Session, bool) {
 	if sess.ID == sessionID {
 		return sess, true
 	}
 	return nil, false
 }
 
 func (sess *Session) GetSessionFromContext(ctx context.Context) (*Session, bool) {
-	sessID, has := SessionIDFromContext(ctx)
+	sessID, has := IDFromContext(ctx)
 	if !has {
 		return nil, false
 	}

diff --git a/session/sessionstore.go b/session/sessionstore.go
@@ -7,18 +7,18 @@ import (
 )
 
 type SessionProvider interface {
-	GetSessionFromID(sessionID SessionID) (*Session, bool)
+	GetSessionFromID(sessionID ID) (*Session, bool)
 	GetSessionFromContext(ctx context.Context) (*Session, bool)
 }
 
 type SessionStore struct {
 	lock     sync.RWMutex
-	sessions map[SessionID]*Session
+	sessions map[ID]*Session
 }
 
 func NewSessionStore() *SessionStore {
 	ss := new(SessionStore)
-	ss.sessions = make(map[SessionID]*Session)
+	ss.sessions = make(map[ID]*Session)
 	return ss
 }
 
@@ -38,7 +38,7 @@ func (s *SessionStore) NewRLWESession(sessParams Parameters, nodeID NodeID) (ses
 	return sess, err
 }
 
-func (s *SessionStore) GetSessionFromID(id SessionID) (*Session, bool) {
+func (s *SessionStore) GetSessionFromID(id ID) (*Session, bool) {
 	s.lock.RLock()
 	defer s.lock.RUnlock()
 	sess, ok := s.sessions[id]

diff --git a/transport/centralized/context.go b/transport/centralized/context.go
@@ -18,7 +18,7 @@ var (
 func getOutgoingContext(ctx context.Context, senderID session.NodeID) context.Context {
 	md := metadata.New(nil)
 	md.Append("sender_id", string(senderID))
-	if sessID, hasSessID := session.SessionIDFromContext(ctx); hasSessID {
+	if sessID, hasSessID := session.IDFromContext(ctx); hasSessID {
 		md.Append(string(ctxSessionID), string(sessID))
 	}
 	if circID, hasCircID := session.CircuitIDFromContext(ctx); hasCircID {
@@ -58,8 +58,8 @@ func senderIDFromIncomingContext(ctx context.Context) session.NodeID {
 	return session.NodeID(valueFromIncomingContext(ctx, "sender_id"))
 }
 
-func sessionIDFromIncomingContext(ctx context.Context) session.SessionID {
-	return session.SessionID(valueFromIncomingContext(ctx, string(ctxSessionID)))
+func sessionIDFromIncomingContext(ctx context.Context) session.ID {
+	return session.ID(valueFromIncomingContext(ctx, string(ctxSessionID)))
 }
 
 func circuitIDFromIncomingContext(ctx context.Context) session.CircuitID {