Merge 45c03a7a9b into cc3d361eb2

http.go

@@ -40,8 +40,6 @@ const defaultReplicas = 50
 
 // HTTPPool implements PeerPicker for a pool of HTTP peers.
 type HTTPPool struct {
-	ws *workspace
-
 	// this peer's base URL, e.g. "https://example.net:8000"
 	self string
 
@@ -106,7 +104,6 @@ func NewHTTPPoolOptsWithWorkspace(ws *workspace, self string, o *HTTPPoolOptions
 	ws.httpPoolMade = true
 
 	p := &HTTPPool{
-		ws:          ws,
 		self:        self,
 		httpGetters: make(map[string]*httpGetter),
 	}
@@ -189,7 +186,7 @@ func (p *HTTPPool) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	key := parts[1]
 
 	// Fetch the value for this group/key.
-	group := GetGroupWithWorkspace(p.ws, groupName)
+	group := GetGroup(groupName)
 	if group == nil {
 		http.Error(w, "no such group: "+groupName, http.StatusNotFound)
 		return