Merge pull request #15398 from ferhatelmas/core-swarm-typo

core, swarm: typo fixes
pull/15415/head
Péter Szilágyi 7 years ago committed by GitHub
commit dd8a62683e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      core/tx_journal.go
  2. 2
      swarm/api/http/error.go
  3. 2
      swarm/api/http/error_test.go
  4. 4
      swarm/storage/pyramid.go

@ -68,7 +68,7 @@ func (journal *txJournal) load(add func(*types.Transaction) error) error {
} }
defer input.Close() defer input.Close()
// Temporarilly discard any journal additions (don't double add on load) // Temporarily discard any journal additions (don't double add on load)
journal.writer = new(devNull) journal.writer = new(devNull)
defer func() { journal.writer = nil }() defer func() { journal.writer = nil }()

@ -72,7 +72,7 @@ func initErrHandling() {
//ShowMultipeChoices is used when a user requests a resource in a manifest which results //ShowMultipeChoices is used when a user requests a resource in a manifest which results
//in ambiguous results. It returns a HTML page with clickable links of each of the entry //in ambiguous results. It returns a HTML page with clickable links of each of the entry
//in the manifest which fits the request URI ambiguity. //in the manifest which fits the request URI ambiguity.
//For example, if the user requests bzz:/<hash>/read and that manifest containes entries //For example, if the user requests bzz:/<hash>/read and that manifest contains entries
//"readme.md" and "readinglist.txt", a HTML page is returned with this two links. //"readme.md" and "readinglist.txt", a HTML page is returned with this two links.
//This only applies if the manifest has no default entry //This only applies if the manifest has no default entry
func ShowMultipleChoices(w http.ResponseWriter, r *http.Request, list api.ManifestList) { func ShowMultipleChoices(w http.ResponseWriter, r *http.Request, list api.ManifestList) {

@ -132,7 +132,7 @@ func TestJsonResponse(t *testing.T) {
} }
if !isJSON(string(respbody)) { if !isJSON(string(respbody)) {
t.Fatalf("Expected repsonse to be JSON, received invalid JSON: %s", string(respbody)) t.Fatalf("Expected response to be JSON, received invalid JSON: %s", string(respbody))
} }
} }

@ -27,7 +27,7 @@ import (
/* /*
The main idea of a pyramid chunker is to process the input data without knowing the entire size apriori. The main idea of a pyramid chunker is to process the input data without knowing the entire size apriori.
For this to be achieved, the chunker tree is built from the ground up until the data is exhausted. For this to be achieved, the chunker tree is built from the ground up until the data is exhausted.
This opens up new aveneus such as easy append and other sort of modifications to the tree therby avoiding This opens up new aveneus such as easy append and other sort of modifications to the tree thereby avoiding
duplication of data chunks. duplication of data chunks.
@ -451,7 +451,7 @@ func (self *PyramidChunker) prepareChunks(isAppend bool, chunkLevel [][]*TreeEnt
} }
} }
// Data ended in chunk boundry.. just signal to start bulding tree // Data ended in chunk boundary.. just signal to start bulding tree
if n == 0 { if n == 0 {
self.buildTree(isAppend, chunkLevel, parent, chunkWG, jobC, quitC, true, rootKey) self.buildTree(isAppend, chunkLevel, parent, chunkWG, jobC, quitC, true, rootKey)
break break

Loading…
Cancel
Save