refactor(gcr/s) extract provider key
Brian Tiger Chow committed
Feb 2, 2015 at 02:48 UTC
5caa179d699d8a5a173e8cf729ea0a2d34e18158
1 file changed
+6
-4
routing/grandcentral/server.go
+6
-4
@@ -153,8 +153,7 @@ func putRoutingProviders(ds datastore.Datastore, k util.Key, newRecords []*dhtpb
153
if err != nil {
154
return err
155
}
156
- pkey := datastore.KeyWithNamespaces([]string{"routing", "providers", k.String()})
157
- return ds.Put(pkey, data)
156
+ return ds.Put(providerKey(k), data)
157
}
158
159
func storeProvidersToPeerstore(ps peer.Peerstore, p peer.ID, providers []*dhtpb.Message_Peer) {
@@ -175,8 +174,7 @@ func getRoutingProviders(ds datastore.Datastore, k util.Key) ([]*dhtpb.Message_P
174
e := log.EventBegin(context.Background(), "getProviders", &k)
175
defer e.Done()
176
var providers []*dhtpb.Message_Peer
178
- pkey := datastore.KeyWithNamespaces([]string{"routing", "providers", k.String()}) // TODO key fmt
179
- if v, err := ds.Get(pkey); err == nil {
177
+ if v, err := ds.Get(providerKey(k)); err == nil {
178
if data, ok := v.([]byte); ok {
179
var msg dhtpb.Message
180
if err := proto.Unmarshal(data, &msg); err != nil {
@@ -187,3 +185,7 @@ func getRoutingProviders(ds datastore.Datastore, k util.Key) ([]*dhtpb.Message_P
185
}
186
return providers, nil
187
}
188
+
189
+func providerKey(k util.Key) datastore.Key {
190
+ return datastore.KeyWithNamespaces([]string{"routing", "providers", k.String()})
191
+}