Remove some keystore usage

index.js

@@ -172,26 +172,24 @@ function init (ssb, config) {
           .forEach(id => ssb.replicate.request({ id, replicate: true }))
       })
 
-      state.loading.keystore.once(() => {
-        pull(
-          pull.values(keystore.group.listSync()),
-          paraMap(
-            (groupId, cb) => scuttle.group.listAuthors(groupId, (err, feedIds) => {
-              if (err) return cb(new Error('error listing authors to replicate on start'))
-              cb(null, feedIds)
-            }),
-            5
-          ),
-          pull.flatten(),
-          pull.unique(),
-          pull.drain(feedId => {
-            if (feedId === ssb.id) return
-            ssb.replicate.request({ id: feedId, replicate: true })
-          }, (err) => {
-            if (err) console.error('error on initializing replication of group members')
-          })
-        )
-      })
+      pull(
+        ssb.box2.listGroupIds(),
+        paraMap(
+          (groupId, cb) => scuttle.group.listAuthors(groupId, (err, feedIds) => {
+            if (err) return cb(new Error('error listing authors to replicate on start'))
+            cb(null, feedIds)
+          }),
+          5
+        ),
+        pull.flatten(),
+        pull.unique(),
+        pull.drain(feedId => {
+          if (feedId === ssb.id) return
+          ssb.replicate.request({ id: feedId, replicate: true })
+        }, (err) => {
+          if (err) console.error('error on initializing replication of group members')
+        })
+      )
     }
   })
 
@@ -208,12 +206,12 @@ function init (ssb, config) {
   const isMemberType = (type) => type === 'group/add-member' || type === 'group/exclude-member'
 
   /* Tangle: auto-add tangles.group info to all private-group messages */
-  const getGroupTangle = GetGroupTangle(ssb, keystore, 'group')
-  const getMembersTangle = GetGroupTangle(ssb, keystore, 'members')
+  const getGroupTangle = GetGroupTangle(ssb, null, 'group')
+  const getMembersTangle = GetGroupTangle(ssb, null, 'members')
   // TODO: make this a ssb.tribes.publish function instead of a hook
 
   /* API */
-  const scuttle = Method(ssb, keystore, state) // ssb db methods
+  const scuttle = Method(ssb) // ssb db methods
 
   const tribeCreate = (opts, cb) => {
     opts = opts || {} // NOTE this catches opts = null, leave it like this

method/group.js

@@ -10,7 +10,7 @@ const addMemberSpec = require('../spec/group/add-member')
 const excludeMemberSpec = require('../spec/group/exclude-member')
 const groupPoBoxSpec = require('../spec/group/po-box')
 
-module.exports = function GroupMethods (ssb, keystore, state) {
+module.exports = function GroupMethods (ssb) {
   const groupPoBoxCrut = new Crut(
     ssb,
     groupPoBoxSpec,

method/index.js

@@ -1,30 +1,14 @@
 const Link = require('./link')
 const Group = require('./group')
 
-module.exports = function Method (ssb, keystore, state) {
+module.exports = function Method (ssb) {
   const link = Link(ssb)
-  const group = Group(ssb, keystore, state)
+  const group = Group(ssb)
 
   return {
-    group: {
-      init: patient(group.init),
-      addMember: patient(group.addMember),
-      excludeMembers: patient(group.excludeMembers),
-      listAuthors: group.listAuthors,
-      addPOBox: patient(group.addPOBox),
-      getPOBox: group.getPOBox
-    },
+    group,
 
-    link
+    link,
     // create createSubGroupLink findGroupByFeedId findParentGroupLinks findSubGroupLinks
   }
-
-  function patient (fn) {
-    // for functions that need keystore to be ready
-    return function (...args) {
-      if (state.loading.keystore.value === false) return fn(...args)
-
-      state.loading.keystore.once(() => fn(...args))
-    }
-  }
 }