From 33312a33a31d7413eba2076b940e31b04afc5a5e Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Fri, 15 Nov 2019 14:17:04 +0100
Subject: [PATCH] fix: persist CIDv1 multicodec

This change avoids creating new CID object if it is already v1
and persists non-dag-pb multicodec if v1 is passed in text form
as specified in
https://github.com/libp2p/specs/blob/master/RFC/0001-text-peerid-cid.md

License: MIT
Signed-off-by: Marcin Rataj <lidel@lidel.org>
---
 src/helpers.js | 12 +++++++-----
 test/test.js   | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/helpers.js b/src/helpers.js
index 56e6c2d..7478eec 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -19,14 +19,16 @@
 const CID = require('cids');
 
 /**
- * Take an ipfsHash and convert it to a CID v1 encoded in base32.
+ * Take any ipfsHash and convert it to a CID v1 encoded in base32.
  * @param {string} ipfsHash a regular ipfs hash either a cid v0 or v1 (v1 will remain unchanged)
  * @return {string} the resulting ipfs hash as a cid v1
  */
 const cidV0ToV1Base32 = (ipfsHash) => {
-	const cidV0 = new CID(ipfsHash);
-	const cidV1Base32 = new CID(1, 'dag-pb', cidV0.multihash, 'base32');
-	return cidV1Base32.toString();
+	let cid = new CID(ipfsHash);
+	if (cid.version === 0) {
+		cid = cid.toV1();
+	}
+	return cid.toString('base32');
 }
 
-exports.cidV0ToV1Base32 = cidV0ToV1Base32;
\ No newline at end of file
+exports.cidV0ToV1Base32 = cidV0ToV1Base32;
diff --git a/test/test.js b/test/test.js
index b280f93..e8296ed 100644
--- a/test/test.js
+++ b/test/test.js
@@ -12,12 +12,12 @@ const onion = 'zqktlwi4fecvo6ri'
 const onion_contentHash = 'bc037a716b746c776934666563766f367269';
 const onion3 = 'p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd';
 const onion3_contentHash = 'bd037035336c663537716f7679757677736336786e72707079706c79337674716d376c3670636f626b6d797173696f6679657a6e667535757164';
-const ipfsBase32 = 'bafybeibj6lixxzqtsb45ysdjnupvqkufgdvzqbnvmhw2kf7cfkesy7r7d4';
+const ipfsBase32DagPb = 'bafybeibj6lixxzqtsb45ysdjnupvqkufgdvzqbnvmhw2kf7cfkesy7r7d4';
+const ipfsBase32Libp2pKey = 'bafzbeie5745rpv2m6tjyuugywy4d5ewrqgqqhfnf445he3omzpjbx5xqxe';
 
-describe('content-hash (legacy tests)', () => 
+describe('content-hash (legacy tests)', () =>
 	{
 		it('should decode a content hash', () => {
-			
 			const actual_0 = contentHash.decode(ipfs_contentHash);
 			const actual_1 = contentHash.decode(swarm_contentHash);
 			let actual_2 = contentHash.decode(onion_contentHash);
@@ -27,22 +27,18 @@ describe('content-hash (legacy tests)', () =>
 			actual_2.should.be.equal(onion);
 		});
 		it('should encode an ipfs address', () => {
-			
 			const actual = contentHash.fromIpfs(ipfs);
 			actual.should.be.equal(ipfs_contentHash);
 		});
 		it('should encode a swarm address', () => {
-			
 			const actual = contentHash.fromSwarm(swarm);
 			actual.should.be.equal(swarm_contentHash);
 		});
 		it('should encode an onion address', () => {
-			
 			const actual = contentHash.encode('onion', onion);
 			actual.should.be.equal(onion_contentHash);
 		});
 		it('should get a codec from a content hash', () => {
-			
 			const actual_0 = contentHash.getCodec(ipfs_contentHash);
 			const actual_1 = contentHash.getCodec(swarm_contentHash);
 			const actual_2 = contentHash.getCodec(onion_contentHash);
@@ -128,7 +124,13 @@ describe('content-hash', () => {
 	describe('helpers', () => {
 		it('should convert CID v0 into v1', () => {
 			const actual = contentHash.helpers.cidV0ToV1Base32(ipfs);
-			actual.should.be.equal(ipfsBase32);
+			actual.should.be.equal(ipfsBase32DagPb);
+		});
+		it('should keep CID v1 Base32 as-is', () => {
+			const dagPbCid = contentHash.helpers.cidV0ToV1Base32(ipfsBase32DagPb);
+			dagPbCid.should.be.equal(ipfsBase32DagPb);
+			const libp2pKeyCid = contentHash.helpers.cidV0ToV1Base32(ipfsBase32Libp2pKey);
+			libp2pKeyCid.should.be.equal(ipfsBase32Libp2pKey);
 		});
 	});
 });