From f085d594aab6d1e416442821d99e5d2817ceb477 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Wed, 1 Oct 2014 00:44:22 -0700 Subject: [PATCH] vendoring ipns things --- Godeps/Godeps.json | 4 + .../github.com/bren2010/proquint/README.md | 6 + .../github.com/bren2010/proquint/proquint.go | 123 ++++++++++++++++++ blockservice/blockservice.go | 2 +- core/commands/publish.go | 2 +- fuse/ipns/ipns_unix.go | 8 +- fuse/readonly/readonly_unix.go | 4 +- namesys/entry.pb.go | 2 +- namesys/proquint.go | 2 +- namesys/publisher.go | 4 +- namesys/routing.go | 8 +- path/path.go | 2 +- routing/dht/dht.go | 2 +- util/util.go | 2 +- 14 files changed, 152 insertions(+), 19 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/bren2010/proquint/README.md create mode 100644 Godeps/_workspace/src/github.com/bren2010/proquint/proquint.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 985b0bccf..fbe7494b0 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -38,6 +38,10 @@ "Comment": "null-15", "Rev": "12e4b4183793ac4b061921e7980845e750679fd0" }, + { + "ImportPath": "github.com/bren2010/proquint", + "Rev": "5958552242606512f714d2e93513b380f43f9991" + }, { "ImportPath": "github.com/camlistore/lock", "Rev": "ae27720f340952636b826119b58130b9c1a847a0" diff --git a/Godeps/_workspace/src/github.com/bren2010/proquint/README.md b/Godeps/_workspace/src/github.com/bren2010/proquint/README.md new file mode 100644 index 000000000..13e7b0b5e --- /dev/null +++ b/Godeps/_workspace/src/github.com/bren2010/proquint/README.md @@ -0,0 +1,6 @@ +Proquint +------- + +Golang implementation of [Proquint Pronounceable Identifiers](https://github.com/deoxxa/proquint). + + diff --git a/Godeps/_workspace/src/github.com/bren2010/proquint/proquint.go b/Godeps/_workspace/src/github.com/bren2010/proquint/proquint.go new file mode 100644 index 000000000..60e1cf981 --- /dev/null +++ b/Godeps/_workspace/src/github.com/bren2010/proquint/proquint.go @@ -0,0 +1,123 @@ +/* +Copyright (c) 2014 Brendan McMillion + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +package proquint + +import ( + "bytes" + "strings" + "regexp" +) + +var ( + conse = [...]byte{'b', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', + 'p', 'r', 's', 't', 'v', 'z'} + vowse = [...]byte{'a', 'i', 'o', 'u'} + + consd = map[byte] uint16 { + 'b' : 0, 'd' : 1, 'f' : 2, 'g' : 3, + 'h' : 4, 'j' : 5, 'k' : 6, 'l' : 7, + 'm' : 8, 'n' : 9, 'p' : 10, 'r' : 11, + 's' : 12, 't' : 13, 'v' : 14, 'z' : 15, + } + + vowsd = map[byte] uint16 { + 'a' : 0, 'i' : 1, 'o' : 2, 'u' : 3, + } +) + +/** +* Tests if a given string is a Proquint identifier +* +* @param {string} str The candidate string. +* +* @return {bool} Whether or not it qualifies. +* @return {error} Error +*/ +func IsProquint(str string) (bool, error) { + exp := "^([abdfghijklmnoprstuvz]{5}-)*[abdfghijklmnoprstuvz]{5}$" + ok, err := regexp.MatchString(exp, str) + + return ok, err +} + +/** +* Encodes an arbitrary byte slice into an identifier. +* +* @param {[]byte} buf Slice of bytes to encode. +* +* @return {string} The given byte slice as an identifier. +*/ +func Encode(buf []byte) string { + var out bytes.Buffer + + for i := 0; i < len(buf); i = i + 2 { + var n uint16 = (uint16(buf[i]) * 256) + uint16(buf[i + 1]) + + var ( + c1 = n & 0x0f + v1 = (n >> 4) & 0x03 + c2 = (n >> 6) & 0x0f + v2 = (n >> 10) & 0x03 + c3 = (n >> 12) & 0x0f + ) + + out.WriteByte(conse[c1]) + out.WriteByte(vowse[v1]) + out.WriteByte(conse[c2]) + out.WriteByte(vowse[v2]) + out.WriteByte(conse[c3]) + + if (i + 2) < len(buf) { + out.WriteByte('-') + } + } + + return out.String() +} + +/** +* Decodes an identifier into its corresponding byte slice. +* +* @param {string} str Identifier to convert. +* +* @return {[]byte} The identifier as a byte slice. +*/ +func Decode(str string) []byte { + var ( + out bytes.Buffer + bits []string = strings.Split(str, "-") + ) + + for i := 0; i < len(bits); i++ { + var x uint16 = consd[bits[i][0]] + + (vowsd[bits[i][1]] << 4) + + (consd[bits[i][2]] << 6) + + (vowsd[bits[i][3]] << 10) + + (consd[bits[i][4]] << 12) + + out.WriteByte(byte(x >> 8)) + out.WriteByte(byte(x)) + } + + return out.Bytes() +} diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go index 51a6e0014..36c3ed607 100644 --- a/blockservice/blockservice.go +++ b/blockservice/blockservice.go @@ -7,7 +7,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" blocks "github.com/jbenet/go-ipfs/blocks" exchange "github.com/jbenet/go-ipfs/exchange" diff --git a/core/commands/publish.go b/core/commands/publish.go index 145e9b06e..bd281b44b 100644 --- a/core/commands/publish.go +++ b/core/commands/publish.go @@ -7,7 +7,7 @@ import ( "github.com/jbenet/go-ipfs/core" u "github.com/jbenet/go-ipfs/util" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" nsys "github.com/jbenet/go-ipfs/namesys" ) diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index c5b31a13c..e7247034b 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -13,15 +13,15 @@ import ( "bytes" - "bazil.org/fuse" - "bazil.org/fuse/fs" - "code.google.com/p/goprotobuf/proto" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" "github.com/jbenet/go-ipfs/core" ci "github.com/jbenet/go-ipfs/crypto" imp "github.com/jbenet/go-ipfs/importer" mdag "github.com/jbenet/go-ipfs/merkledag" u "github.com/jbenet/go-ipfs/util" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" ) var log = logging.MustGetLogger("ipns") diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index 1fa7bfb0d..8641916e2 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -14,14 +14,14 @@ import ( "syscall" "time" - "code.google.com/p/goprotobuf/proto" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" core "github.com/jbenet/go-ipfs/core" mdag "github.com/jbenet/go-ipfs/merkledag" u "github.com/jbenet/go-ipfs/util" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" ) var log = logging.MustGetLogger("ipfs") diff --git a/namesys/entry.pb.go b/namesys/entry.pb.go index e4420e9f9..d9dc5160b 100644 --- a/namesys/entry.pb.go +++ b/namesys/entry.pb.go @@ -13,7 +13,7 @@ It has these top-level messages: */ package namesys -import proto "code.google.com/p/goprotobuf/proto" +import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/namesys/proquint.go b/namesys/proquint.go index 9b64f3fde..bf34c3b6c 100644 --- a/namesys/proquint.go +++ b/namesys/proquint.go @@ -3,7 +3,7 @@ package namesys import ( "errors" - proquint "github.com/bren2010/proquint" + proquint "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/bren2010/proquint" ) type ProquintResolver struct{} diff --git a/namesys/publisher.go b/namesys/publisher.go index 73a4197e1..a4292d7fe 100644 --- a/namesys/publisher.go +++ b/namesys/publisher.go @@ -3,8 +3,8 @@ package namesys import ( "time" - "code.google.com/p/go.net/context" - "code.google.com/p/goprotobuf/proto" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" ci "github.com/jbenet/go-ipfs/crypto" mdag "github.com/jbenet/go-ipfs/merkledag" diff --git a/namesys/routing.go b/namesys/routing.go index 605458eef..4c2b0d816 100644 --- a/namesys/routing.go +++ b/namesys/routing.go @@ -3,15 +3,15 @@ package namesys import ( "fmt" - "code.google.com/p/go.net/context" - "code.google.com/p/goprotobuf/proto" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" ci "github.com/jbenet/go-ipfs/crypto" mdag "github.com/jbenet/go-ipfs/merkledag" "github.com/jbenet/go-ipfs/routing" u "github.com/jbenet/go-ipfs/util" - mh "github.com/jbenet/go-multihash" - "github.com/op/go-logging" + mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" ) var log = logging.MustGetLogger("namesys") diff --git a/path/path.go b/path/path.go index 533afc7cd..ebc9d81d6 100644 --- a/path/path.go +++ b/path/path.go @@ -8,7 +8,7 @@ import ( mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" merkledag "github.com/jbenet/go-ipfs/merkledag" u "github.com/jbenet/go-ipfs/util" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" ) var log = logging.MustGetLogger("path") diff --git a/routing/dht/dht.go b/routing/dht/dht.go index eccfd7e45..f02be4711 100644 --- a/routing/dht/dht.go +++ b/routing/dht/dht.go @@ -13,7 +13,7 @@ import ( peer "github.com/jbenet/go-ipfs/peer" kb "github.com/jbenet/go-ipfs/routing/kbucket" u "github.com/jbenet/go-ipfs/util" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" diff --git a/util/util.go b/util/util.go index b33960471..4778146c0 100644 --- a/util/util.go +++ b/util/util.go @@ -11,7 +11,7 @@ import ( ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" - "github.com/op/go-logging" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging" ) var format = "%{color}%{time:01-02 15:04:05.9999} %{shortfile} %{level}: %{color:reset}%{message}"