From bf64b6fbe04ad647d206dd64d89d3c8ed45d3a03 Mon Sep 17 00:00:00 2001
From: Nicholas Dudfield <ndudfield@gmail.com>
Date: Fri, 31 Jul 2015 17:49:21 +0700
Subject: [PATCH] Tweak README and accountPublicFromPublicGenerator

---
 packages/ripple-keypairs/README.md        |  2 +-
 packages/ripple-keypairs/src/index.js     | 20 +++++++++++---------
 packages/ripple-keypairs/src/secp256k1.js |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/ripple-keypairs/README.md b/packages/ripple-keypairs/README.md
index 91c469dd..5e0f6c7f 100644
--- a/packages/ripple-keypairs/README.md
+++ b/packages/ripple-keypairs/README.md
@@ -1,6 +1,6 @@
 # ripple-keypairs
 
-[![NPM](https://img.shields.io/npm/v/ripple-keypairs.svg)](https://npmjs.org/package/ripple-keypairs) [![Build Status](https://img.shields.io/travis/sublimator/ripple-keypairs/master.svg)](https://travis-ci.org/sublimator/ripple-keypairs) [![Coverage Status](https://img.shields.io/coveralls/sublimator/ripple-keypairs/master.svg)](https://coveralls.io/github/sublimator/ripple-keypairs?branch=master)
+[![NPM](https://img.shields.io/npm/v/ripple-keypairs.svg)](https://npmjs.org/package/ripple-keypairs) [![Build Status](https://img.shields.io/travis/sublimator/ripple-keypairs/master.svg)](https://travis-ci.org/sublimator/ripple-keypairs) [![Coverage Status](https://coveralls.io/repos/sublimator/ripple-keypairs/badge.svg?branch=master&service=github)](https://coveralls.io/github/sublimator/ripple-keypairs?branch=master)
 
 An implementation of ripple keypairs & wallet generation using
 [elliptic](https://github.com/indutny/elliptic) which supports rfc6979 and
diff --git a/packages/ripple-keypairs/src/index.js b/packages/ripple-keypairs/src/index.js
index 73f69c81..7ad92bef 100644
--- a/packages/ripple-keypairs/src/index.js
+++ b/packages/ripple-keypairs/src/index.js
@@ -1,13 +1,15 @@
 'use strict';
 
 const assert = require('assert');
-const codec = require('ripple-address-codec');
 const rand = require('brorand');
 
 const {seedFromPhrase, createAccountID} = require('./utils');
 const {KeyPair, KeyType} = require('./keypair');
 const {Ed25519Pair} = require('./ed25519');
-const {K256Pair, accountPublicFromGenerator} = require('./secp256k1');
+const {K256Pair, accountPublicFromPublicGenerator} = require('./secp256k1');
+
+const {decodeSeed, encodeNodePublic, decodeNodePublic, encodeAccountID} =
+                                          require('ripple-address-codec');
 
 KeyPair.fromSeed = function(seedBytes, type, options) {
   assert(type === 'secp256k1' || type === 'ed25519');
@@ -16,7 +18,7 @@ KeyPair.fromSeed = function(seedBytes, type, options) {
 };
 
 function keyPairFromSeed(seedString, options) {
-  const decoded = codec.decodeSeed(seedString);
+  const decoded = decodeSeed(seedString);
   return KeyPair.fromSeed(decoded.bytes, decoded.type, options);
 }
 
@@ -37,7 +39,7 @@ function generateWallet(opts={}) {
 }
 
 function walletFromSeed(seed) {
-  const {type, bytes} = codec.decodeSeed(seed);
+  const {type, bytes} = decodeSeed(seed);
   return deriveWallet(type, bytes);
 }
 
@@ -45,7 +47,7 @@ function deriveValidator(seedBytes) {
   const pair = K256Pair.fromSeed(seedBytes, {validator: true});
   return {
     seed: pair.seed(),
-    publicKey: codec.encodeNodePublic(pair.pubKeyCanonicalBytes())
+    publicKey: encodeNodePublic(pair.pubKeyCanonicalBytes())
   };
 }
 
@@ -55,13 +57,13 @@ function generateValidatorKeys(opts={}) {
 }
 
 function nodePublicAccountID(publicKey) {
-  const genBytes = codec.decodeNodePublic(publicKey);
-  const accountPublicBytes = accountPublicFromGenerator(genBytes);
-  return codec.encodeAccountID(createAccountID(accountPublicBytes));
+  const generatorBytes = decodeNodePublic(publicKey);
+  const accountPublicBytes = accountPublicFromPublicGenerator(generatorBytes);
+  return encodeAccountID(createAccountID(accountPublicBytes));
 }
 
 function validatorKeysFromSeed(seed) {
-  const {type, bytes} = codec.decodeSeed(seed);
+  const {type, bytes} = decodeSeed(seed);
   assert(type === KeyType.secp256k1);
   return deriveValidator(bytes);
 }
diff --git a/packages/ripple-keypairs/src/secp256k1.js b/packages/ripple-keypairs/src/secp256k1.js
index 9b5872e1..1d6a787d 100644
--- a/packages/ripple-keypairs/src/secp256k1.js
+++ b/packages/ripple-keypairs/src/secp256k1.js
@@ -57,7 +57,7 @@ function deriveSecret(seed, opts={}) {
             .add(privateGen).mod(order);
 }
 
-function accountPublicFromGenerator(publicGenBytes) {
+function accountPublicFromPublicGenerator(publicGenBytes) {
   const rootPubPoint = secp256k1.curve.decodePoint(publicGenBytes);
   const scalar = deriveScalar(publicGenBytes, 0);
   const point = secp256k1.g.mul(scalar);
@@ -126,5 +126,5 @@ K256Pair.prototype.verify = function(message, signature) {
 
 module.exports = {
   K256Pair,
-  accountPublicFromGenerator
+  accountPublicFromPublicGenerator
 };