Skip to content

Enable Multihash Selection #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bonedaddy merged 2 commits into from
May 22, 2019
Merged

Enable Multihash Selection #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
374df1a
shell: enable hash function selection when adding a file
postables May 22, 2019
2e20472
tests: for logger test change to NewShell
postables May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"path"

"github.com/ipfs/go-ipfs-files"
files "github.com/ipfs/go-ipfs-files"
)

type object struct {
Expand Down Expand Up @@ -45,6 +45,14 @@ func RawLeaves(enabled bool) AddOpts {
}
}

// Hash allows for selecting the multihash type
func Hash(hash string) AddOpts {
return func(rb *RequestBuilder) error {
rb.Option("hash", hash)
return nil
}
}

func (s *Shell) Add(r io.Reader, options ...AddOpts) (string, error) {
fr := files.NewReaderFile(r)
slf := files.NewSliceDirectory([]files.DirEntry{files.FileEntry("", fr)})
Expand Down
2 changes: 1 addition & 1 deletion log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
func Test_Logger(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
sh := NewLocalShell()
sh := NewShell(shellUrl)
logger, err := sh.GetLogs(ctx)
if err != nil {
t.Fatal(err)
Expand Down
3 changes: 3 additions & 0 deletions shell_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ func TestAdd(t *testing.T) {
mhash, err := s.Add(bytes.NewBufferString("Hello IPFS Shell tests"))
is.Nil(err)
is.Equal(mhash, "QmUfZ9rAdhV5ioBzXKdUTh2ZNsz9bzbkaLVyQ8uc8pj21F")
mhash, err = s.Add(bytes.NewBufferString("Hello IPFS Shell tests"), Hash("sha3-256"))
is.Nil(err)
is.Equal(mhash, "zb2wwqxjxosf8GKEZCwAWSFZ879XFNca3De5yAoh5b2axAffc")
}

func TestRedirect(t *testing.T) {
Expand Down