roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #17781 from ethersphere/trim_newline

Browse Source 
cmd/swarm: trim new lines from files
This commit is contained in:
Viktor Trón 2018-09-28 20:01:43 +02:00 committed by GitHub
commit 7910dd5179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/swarm/access.go
View File

@ -130,7 +130,7 @@ func accessNewACT(ctx *cli.Context) {
if err != nil {
utils.Fatalf("had an error reading the grantee public key list")
}
pkGrantees = strings.Split(string(bytes), "\n")
pkGrantees = strings.Split(strings.Trim(string(bytes), "\n"), "\n")
}
if passGranteesFilename != "" {
@ -138,7 +138,7 @@ func accessNewACT(ctx *cli.Context) {
if err != nil {
utils.Fatalf("could not read password filename: %v", err)
}
passGrantees = strings.Split(string(bytes), "\n")
passGrantees = strings.Split(strings.Trim(string(bytes), "\n"), "\n")
}
accessKey, ae, actManifest, err = api.DoACT(ctx, privateKey, salt, pkGrantees, passGrantees)
if err != nil {

6
swarm/storage/mru/lookup/epoch_test.go
View File

@ -42,15 +42,15 @@ func TestAfter(t *testing.T) {
Level: 4,
}
if b.After(a) != true {
if !b.After(a) {
t.Fatal("Expected 'after' to be true, got false")
}
if b.After(b) != false {
if b.After(b) {
t.Fatal("Expected 'after' to be false when both epochs are identical, got true")
}
if b.After(c) != true {
if !b.After(c) {
t.Fatal("Expected 'after' to be true when both epochs have the same time but the level is lower in the first one, but got false")
}

4
swarm/storage/mru/lookup/lookup_test.go
View File

@ -38,9 +38,7 @@ func write(store Store, epoch lookup.Epoch, value *Data) {
}
func update(store Store, last lookup.Epoch, now uint64, value *Data) lookup.Epoch {
var epoch lookup.Epoch
epoch = lookup.GetNextEpoch(last, now)
epoch := lookup.GetNextEpoch(last, now)
write(store, epoch, value)

2
swarm/storage/mru/query.go
View File

@ -36,7 +36,7 @@ type Query struct {
// useful to parse query strings
func (q *Query) FromValues(values Values) error {
time, _ := strconv.ParseUint(values.Get("time"), 10, 64)
q.TimeLimit = uint64(time)
q.TimeLimit = time
level, _ := strconv.ParseUint(values.Get("hint.level"), 10, 32)
q.Hint.Level = uint8(level)