From d86a59c393ac6098d12e743cd94aeb7184a21bb2 Mon Sep 17 00:00:00 2001
From: Romain Beaumont <romain.rom1@gmail.com>
Date: Mon, 9 Nov 2015 15:40:04 +0100
Subject: [PATCH] use protodef utils, fix #295

---
 src/browser.js     |  2 --
 src/index.js       |  1 -
 src/utils.js       | 42 ------------------------------------------
 test/packetTest.js |  4 ++--
 4 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 src/utils.js

diff --git a/src/browser.js b/src/browser.js
index 31d89bb..13f6d07 100644
--- a/src/browser.js
+++ b/src/browser.js
@@ -1,5 +1,3 @@
-var utils = require("./utils");
-
 module.exports = {
   Client: require('./client'),
   supportedVersions:require("./version").supportedVersions
diff --git a/src/index.js b/src/index.js
index 2b9ce7d..8d90027 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,6 @@
 var Client = require('./client');
 var Server = require('./server');
 var serializer = require("./transforms/serializer");
-var utils = require("./utils");
 var createClient = require("./createClient");
 var createServer = require("./createServer");
 
diff --git a/src/utils.js b/src/utils.js
deleted file mode 100644
index 03d2e42..0000000
--- a/src/utils.js
+++ /dev/null
@@ -1,42 +0,0 @@
-module.exports = {
-  getField: getField,
-  getFieldInfo: getFieldInfo,
-  addErrorField: addErrorField,
-  tryCatch: tryCatch,
-};
-
-function getField(countField, context) {
-  var countFieldArr = countField.split("/");
-  var i = 0;
-  if (countFieldArr[i] === "") {
-    while (context.hasOwnProperty(".."))
-      context = context[".."];
-    i++;
-  }
-  for(; i < countFieldArr.length; i++) {
-    context = context[countFieldArr[i]];
-  }
-  return context;
-}
-
-function getFieldInfo(fieldInfo) {
-  if (typeof fieldInfo === "string")
-    return { type: fieldInfo };
-  else if (Array.isArray(fieldInfo))
-    return { type: fieldInfo[0], typeArgs: fieldInfo[1] };
-  else if (typeof fieldInfo.type === "string")
-    return fieldInfo;
-  else
-    throw new Error("Not a fieldinfo");
-}
-
-function addErrorField(e, field) {
-  if (e.field)
-    e.field = field + "." + e.field;
-  else
-    e.field = field;
-}
-
-function tryCatch(tryfn, catchfn) {
-  try { tryfn(); } catch (e) { catchfn(e); }
-}
diff --git a/test/packetTest.js b/test/packetTest.js
index cb60ca7..447ba0a 100644
--- a/test/packetTest.js
+++ b/test/packetTest.js
@@ -4,8 +4,8 @@ var Client = mc.Client;
 var Server = mc.Server;
 var net = require('net');
 var assert = require('power-assert');
-var getFieldInfo = require('../dist/utils').getFieldInfo;
-var getField = require('../dist/utils').getField;
+var getFieldInfo = require('protodef').utils.getFieldInfo;
+var getField = require('protodef').utils.getField;
 
 function evalCount(count, fields) {
   if(fields[count["field"]] in count["map"])