From 47a6842e3507c1dc3214375815ec0c6f6467be30 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Thu, 3 Jul 2014 23:44:09 -0700
Subject: [PATCH] rm convert

---
 codec.go   | 40 ++++++++++++++++++++++++++++++++++++++++
 convert.go | 43 -------------------------------------------
 2 files changed, 40 insertions(+), 43 deletions(-)
 delete mode 100644 convert.go

diff --git a/codec.go b/codec.go
index 48b1de0..0a8c660 100644
--- a/codec.go
+++ b/codec.go
@@ -3,6 +3,9 @@ package multiaddr
 import(
   "fmt"
   "strings"
+  "encoding/binary"
+  "net"
+  "strconv"
 )
 
 
@@ -48,3 +51,40 @@ func BytesToString(b []byte) (string, error) {
 
   return s, nil
 }
+
+func AddressStringToBytes(p *Protocol, s string) []byte {
+  switch p.Code {
+
+  // ipv4,6
+  case 4, 41:
+    return net.ParseIP(s).To4()
+
+  // tcp udp dccp sctp
+  case 6, 17, 33, 132:
+    b := make([]byte, 2)
+    i, err := strconv.Atoi(s)
+    if err == nil {
+      binary.BigEndian.PutUint16(b, uint16(i))
+    }
+    return b
+  }
+
+  return []byte{}
+}
+
+func AddressBytesToString(p *Protocol, b []byte) string {
+  switch p.Code {
+
+  // ipv4,6
+  case 4, 41:
+    return net.IP(b).String()
+
+  // tcp udp dccp sctp
+  case 6, 17, 33, 132:
+    i := binary.BigEndian.Uint16(b)
+    return strconv.Itoa(int(i))
+  }
+
+  return ""
+}
+
diff --git a/convert.go b/convert.go
deleted file mode 100644
index dc988f3..0000000
--- a/convert.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package multiaddr
-
-import (
-  "encoding/binary"
-  "net"
-  "strconv"
-)
-
-func AddressStringToBytes(p *Protocol, s string) []byte {
-  switch p.Code {
-
-  // ipv4,6
-  case 4, 41:
-    return net.ParseIP(s).To4()
-
-  // tcp udp dccp sctp
-  case 6, 17, 33, 132:
-    b := make([]byte, 2)
-    i, err := strconv.Atoi(s)
-    if err == nil {
-      binary.BigEndian.PutUint16(b, uint16(i))
-    }
-    return b
-  }
-
-  return []byte{}
-}
-
-func AddressBytesToString(p *Protocol, b []byte) string {
-  switch p.Code {
-
-  // ipv4,6
-  case 4, 41:
-    return net.IP(b).String()
-
-  // tcp udp dccp sctp
-  case 6, 17, 33, 132:
-    i := binary.BigEndian.Uint16(b)
-    return strconv.Itoa(int(i))
-  }
-
-  return ""
-}