From fee66fb6373a718608426b130da262150af2d9ea Mon Sep 17 00:00:00 2001
From: Shusetsu Toda <shusetsu@lightcurve.io>
Date: Fri, 16 Feb 2018 18:00:38 +0100
Subject: [PATCH] :house: Fix rebase error

---
 package-lock.json                             | 26 +++++++++++++++++++
 src/transactions/utils/getTransactionBytes.js | 10 +++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f96708510..c51c07db0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -356,6 +356,20 @@
 			"integrity": "sha1-GN3oS/POMp/d8/QQP66SFFbY5Yc=",
 			"dev": true
 		},
+		"babel-plugin-module-resolver": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.0.0.tgz",
+			"integrity": "sha512-U394VtqR+uGozwV43paA9tUOJ2WYP/OpLMla7u/Qi+/A0chDwuRoYu1hkqkkNTAvoq21ybSIgdCeDV4GVvqfeA==",
+			"dev": true,
+			"dependencies": {
+				"pkg-up": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+					"integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+					"dev": true
+				}
+			}
+		},
 		"babel-plugin-rewire": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-rewire/-/babel-plugin-rewire-1.1.0.tgz",
@@ -1760,6 +1774,12 @@
 			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
 			"dev": true
 		},
+		"find-babel-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.1.0.tgz",
+			"integrity": "sha1-rMAQQ6Z0n+w0Qpvmtk9ULrtdY1U=",
+			"dev": true
+		},
 		"find-up": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -6040,6 +6060,12 @@
 			"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
 			"dev": true
 		},
+		"reselect": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
+			"integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=",
+			"dev": true
+		},
 		"resolve": {
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
diff --git a/src/transactions/utils/getTransactionBytes.js b/src/transactions/utils/getTransactionBytes.js
index 987c8229c..c552db743 100644
--- a/src/transactions/utils/getTransactionBytes.js
+++ b/src/transactions/utils/getTransactionBytes.js
@@ -49,7 +49,7 @@ export const getAssetDataForRegisterSecondSignatureTransaction = ({
 }) => {
 	checkRequiredFields(['publicKey'], signature);
 	const { publicKey } = signature;
-	return cryptoModule.hexToBuffer(publicKey);
+	return cryptography.hexToBuffer(publicKey);
 };
 
 export const getAssetDataForRegisterDelegateTransaction = ({ delegate }) => {
@@ -159,12 +159,12 @@ const getTransactionBytes = transaction => {
 		BYTESIZES.TIMESTAMP,
 	);
 
-	const transactionSenderPublicKey = cryptoModule.hexToBuffer(
+	const transactionSenderPublicKey = cryptography.hexToBuffer(
 		transaction.senderPublicKey,
 	);
 
 	const transactionRequesterPublicKey = transaction.requesterPublicKey
-		? cryptoModule.hexToBuffer(transaction.requesterPublicKey)
+		? cryptography.hexToBuffer(transaction.requesterPublicKey)
 		: Buffer.alloc(0);
 
 	const transactionRecipientID = transaction.recipientId
@@ -182,11 +182,11 @@ const getTransactionBytes = transaction => {
 	const transactionAssetData = getAssetBytes(transaction);
 
 	const transactionSignature = transaction.signature
-		? cryptoModule.hexToBuffer(transaction.signature)
+		? cryptography.hexToBuffer(transaction.signature)
 		: Buffer.alloc(0);
 
 	const transactionSecondSignature = transaction.signSignature
-		? cryptoModule.hexToBuffer(transaction.signSignature)
+		? cryptography.hexToBuffer(transaction.signSignature)
 		: Buffer.alloc(0);
 
 	return Buffer.concat([