Async signature and various fixes

3 files changed, 3 insertions, 13 deletions

diff --git a/server/lib/friends.ts b/server/lib/friends.ts
index 498144318..c24839cb6 100644
--- a/server/lib/friends.ts
+++ b/server/lib/friends.ts
@@ -141,9 +141,7 @@ function makeFriends (hosts: string[]) {
   logger.info('Make friends!')
   return getMyPublicCert()
     .then(cert => {
-      return Promise.mapSeries(hosts, host => {
-        return computeForeignPodsList(host, podsScore)
-      }).then(() => cert)
+      return Promise.each(hosts, host => computeForeignPodsList(host, podsScore)).then(() => cert)
     })
     .then(cert => {
       logger.debug('Pods scores computed.', { podsScore: podsScore })
@@ -169,7 +167,6 @@ function quitFriends () {
       const requestParams = {
         method: 'POST' as 'POST',
         path: '/api/' + API_VERSION + '/remote/pods/remove',
-        sign: true,
         toPod: null
       }
 
@@ -178,6 +175,7 @@ function quitFriends () {
       // The other pod will exclude us automatically after a while
       return Promise.map(pods, pod => {
         requestParams.toPod = pod
+
         return makeSecureRequest(requestParams)
       }, { concurrency: REQUESTS_IN_PARALLEL })
       .then(() => pods)
diff --git a/server/lib/request/abstract-request-scheduler.ts b/server/lib/request/abstract-request-scheduler.ts
index dd77fddb7..128fc5b28 100644
--- a/server/lib/request/abstract-request-scheduler.ts
+++ b/server/lib/request/abstract-request-scheduler.ts
@@ -70,7 +70,6 @@ abstract class AbstractRequestScheduler <T> {
   protected makeRequest (toPod: PodInstance, requestEndpoint: string, requestsToMake: Object) {
     const params = {
       toPod: toPod,
-      sign: true, // Prove our identity
       method: 'POST' as 'POST',
       path: '/api/' + API_VERSION + '/remote/' + requestEndpoint,
       data: requestsToMake // Requests we need to make
diff --git a/server/lib/request/request-scheduler.ts b/server/lib/request/request-scheduler.ts
index 0dd796fb0..8927d53bb 100644
--- a/server/lib/request/request-scheduler.ts
+++ b/server/lib/request/request-scheduler.ts
@@ -61,16 +61,9 @@ class RequestScheduler extends AbstractRequestScheduler<RequestsGrouped> {
   }
 
   createRequest ({ type, endpoint, data, toIds, transaction }: RequestSchedulerOptions) {
-    // TODO: check the setPods works
-    const podIds = []
-
     // If there are no destination pods abort
     if (toIds.length === 0) return undefined
 
-    toIds.forEach(toPod => {
-      podIds.push(toPod)
-    })
-
     const createQuery = {
       endpoint,
       request: {
@@ -85,7 +78,7 @@ class RequestScheduler extends AbstractRequestScheduler<RequestsGrouped> {
 
     return db.Request.create(createQuery, dbRequestOptions)
       .then(request => {
-        return request.setPods(podIds, dbRequestOptions)
+        return request.setPods(toIds, dbRequestOptions)
       })
   }