From f1e86ad9cf0470051b7106ee83794d27276b528d Mon Sep 17 00:00:00 2001 From: Javier Peletier Date: Sat, 29 Sep 2018 01:00:28 +0200 Subject: swarm/storage/mru: Renamed all identifiers to Feeds --- swarm/api/http/server.go | 8 ++++---- swarm/api/http/server_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'swarm/api/http') diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 5ec69373d..4c19dd6df 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -517,7 +517,7 @@ func (s *Server) HandlePostResource(w http.ResponseWriter, r *http.Request) { } var updateRequest mru.Request - updateRequest.View = *view + updateRequest.Feed = *view query := r.URL.Query() if err := updateRequest.FromValues(query, body); err != nil { // decodes request from query parameters @@ -544,7 +544,7 @@ func (s *Server) HandlePostResource(w http.ResponseWriter, r *http.Request) { // we create a manifest so we can retrieve the resource with bzz:// later // this manifest has a special "resource type" manifest, and saves the // resource view ID used to retrieve the resource later - m, err := s.api.NewResourceManifest(r.Context(), &updateRequest.View) + m, err := s.api.NewResourceManifest(r.Context(), &updateRequest.Feed) if err != nil { RespondError(w, r, fmt.Sprintf("failed to create resource manifest: %v", err), http.StatusInternalServerError) return @@ -563,7 +563,7 @@ func (s *Server) HandlePostResource(w http.ResponseWriter, r *http.Request) { } } -// Retrieve mutable resource updates: +// Retrieve Swarm Feeds: // bzz-resource:// - get latest update // bzz-resource:///?period=n - get latest update on period n // bzz-resource:///?period=n&version=m - get update version m of period n @@ -606,7 +606,7 @@ func (s *Server) HandleGetResource(w http.ResponseWriter, r *http.Request) { return } - lookupParams := &mru.Query{View: *view} + lookupParams := &mru.Query{Feed: *view} if err = lookupParams.FromValues(r.URL.Query()); err != nil { // parse period, version RespondError(w, r, fmt.Sprintf("invalid mutable resource request:%s", err), http.StatusBadRequest) return diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 817519a30..0855d30a2 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -206,7 +206,7 @@ func TestBzzResourceMultihash(t *testing.T) { } } -// Test resource updates using the raw update methods +// Test Swarm Feeds using the raw update methods func TestBzzResource(t *testing.T) { srv := testutil.NewTestSwarmServer(t, serverFunc, nil) signer, _ := newTestSigner() @@ -406,7 +406,7 @@ func TestBzzResource(t *testing.T) { // test manifest-less queries log.Info("get first update in update1Timestamp via direct query") - query := mru.NewQuery(&updateRequest.View, update1Timestamp, lookup.NoClue) + query := mru.NewQuery(&updateRequest.Feed, update1Timestamp, lookup.NoClue) urlq, err := url.Parse(fmt.Sprintf("%s/bzz-resource:/", srv.URL)) if err != nil { -- cgit v1.2.3