registrars: api-registrar use lib

Author: marshallstone

pkg/registrars/registration/api-registrar.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/refraction-networking/conjure/pkg/registrars/lib"
 	pb "github.com/refraction-networking/conjure/proto"
 	"github.com/refraction-networking/gotapdance/tapdance"
 	"github.com/sirupsen/logrus"
@@ -72,13 +73,13 @@ func (r *APIRegistrar) registerUnidirectional(cjSession *tapdance.ConjureSession
 	reg, protoPayload, err := cjSession.UnidirectionalRegData(pb.RegistrationSource_API.Enum())
 	if err != nil {
 		logger.Errorf("Failed to prepare registration data: %v", err)
-		return nil, ErrRegFailed
+		return nil, lib.ErrRegFailed
 	}
 
 	payload, err := proto.Marshal(protoPayload)
 	if err != nil {
 		logger.Errorf("failed to marshal ClientToStation payload: %v", err)
-		return nil, ErrRegFailed
+		return nil, lib.ErrRegFailed
 	}
 
 	r.setHTTPClient(reg)
@@ -102,7 +103,7 @@ func (r *APIRegistrar) registerUnidirectional(cjSession *tapdance.ConjureSession
 		return r.secondaryRegistrar.Register(cjSession, ctx)
 	}
 
-	return nil, ErrRegFailed
+	return nil, lib.ErrRegFailed
 }
 
 // registerBidirectional sends bidirectional registration data to the registration server and reads the response
@@ -112,13 +113,13 @@ func (r *APIRegistrar) registerBidirectional(cjSession *tapdance.ConjureSession,
 	reg, protoPayload, err := cjSession.BidirectionalRegData(pb.RegistrationSource_BidirectionalAPI.Enum())
 	if err != nil {
 		logger.Errorf("Failed to prepare registration data: %v", err)
-		return nil, ErrRegFailed
+		return nil, lib.ErrRegFailed
 	}
 
 	payload, err := proto.Marshal(protoPayload)
 	if err != nil {
 		logger.Errorf("failed to marshal ClientToStation payload: %v", err)
-		return nil, ErrRegFailed
+		return nil, lib.ErrRegFailed
 	}
 
 	r.setHTTPClient(reg)
@@ -148,7 +149,7 @@ func (r *APIRegistrar) registerBidirectional(cjSession *tapdance.ConjureSession,
 		return r.secondaryRegistrar.Register(cjSession, ctx)
 	}
 
-	return nil, ErrRegFailed
+	return nil, lib.ErrRegFailed
 }
 
 func (r *APIRegistrar) setHTTPClient(reg *tapdance.ConjureReg) {
@@ -164,7 +165,7 @@ func (r *APIRegistrar) setHTTPClient(reg *tapdance.ConjureReg) {
 }
 
 func (r APIRegistrar) Register(cjSession *tapdance.ConjureSession, ctx context.Context) (*tapdance.ConjureReg, error) {
-	defer sleepWithContext(ctx, r.connectionDelay)
+	defer lib.SleepWithContext(ctx, r.connectionDelay)
 
 	if r.bidirectional {
 		return r.registerBidirectional(cjSession, ctx)