Skip to content
This repository has been archived by the owner on Dec 16, 2021. It is now read-only.

Commit

Permalink
refactor!: removed deprecated get identity by first key endpoints (#307)
Browse files Browse the repository at this point in the history
BREAKING CHANGES: removed deprecated get identity by first key endpoin
  • Loading branch information
Konstantin Shuplenkov committed Oct 21, 2020
1 parent 5ce8334 commit 3aab63c
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 467 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install:
- npm ci
- cp .env.example .env
# Get the latest version of travis-ci-tools
- curl -s https://api.github.com/repos/dashevo/travis-ci-tools/releases/latest | jq -r '.tarball_url' | xargs -I {} -n1 wget -O travis-ci-tools.tar.gz -q {}
- curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/dashevo/travis-ci-tools/releases/latest | jq -r '.tarball_url' | xargs -I {} -n1 wget -O travis-ci-tools.tar.gz -q {}
- mkdir ~/travis-ci-tools && tar -C ~/travis-ci-tools -xvf travis-ci-tools.tar.gz
- export CI_TOOLS_DIR="$(ls ~/travis-ci-tools)"
- cd ~/travis-ci-tools/$CI_TOOLS_DIR
Expand Down
31 changes: 0 additions & 31 deletions lib/externalApis/drive/DriveStateRepository.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,37 +113,6 @@ class DriveStateRepository {
);
}

/**
* Fetch identity id by public key hash
*
* @param {string} publicKeyHash
*
* @returns {Promise<Buffer>}
*/
async fetchPublicKeyIdentityId(publicKeyHash) {
return this.request(`/identities/by-first-public-key/${publicKeyHash}/id`);
}

/**
* Fetch serialized identity by public key hash
*
* @param {string} publicKeyHash
* @return {Promise<Buffer>}
*/
async fetchIdentityByFirstPublicKey(publicKeyHash) {
return this.request(`/identities/by-first-public-key/${publicKeyHash}`);
}

/**
* Fetch identity id by public key hash
*
* @param {string} publicKeyHash
* @return {Promise<string>}
*/
async fetchIdentityIdByFirstPublicKey(publicKeyHash) {
return this.request(`/identities/by-first-public-key/${publicKeyHash}/id`);
}

/**
* Fetch serialized identities by it's public key hashes
*
Expand Down

This file was deleted.

This file was deleted.

46 changes: 0 additions & 46 deletions lib/grpcServer/handlers/platform/platformHandlersFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ const {
GetIdentityRequest,
GetDataContractRequest,
GetDocumentsRequest,
GetIdentityByFirstPublicKeyRequest,
GetIdentityIdByFirstPublicKeyRequest,
GetIdentitiesByPublicKeyHashesRequest,
GetIdentityIdsByPublicKeyHashesRequest,
pbjs: {
Expand All @@ -32,10 +30,6 @@ const {
GetDataContractResponse: PBJSGetDataContractResponse,
GetDocumentsRequest: PBJSGetDocumentsRequest,
GetDocumentsResponse: PBJSGetDocumentsResponse,
GetIdentityByFirstPublicKeyResponse: PBJSGetIdentityByFirstPublicKeyResponse,
GetIdentityByFirstPublicKeyRequest: PBJSGetIdentityByFirstPublicKeyRequest,
GetIdentityIdByFirstPublicKeyResponse: PBJSGetIdentityIdByFirstPublicKeyResponse,
GetIdentityIdByFirstPublicKeyRequest: PBJSGetIdentityIdByFirstPublicKeyRequest,
GetIdentitiesByPublicKeyHashesResponse: PBJSGetIdentitiesByPublicKeyHashesResponse,
GetIdentitiesByPublicKeyHashesRequest: PBJSGetIdentitiesByPublicKeyHashesRequest,
GetIdentityIdsByPublicKeyHashesResponse: PBJSGetIdentityIdsByPublicKeyHashesResponse,
Expand All @@ -60,12 +54,6 @@ const getDocumentsHandlerFactory = require(
const getDataContractHandlerFactory = require(
'./getDataContractHandlerFactory',
);
const getIdentityByFirstPublicKeyHandlerFactory = require(
'./getIdentityByFirstPublicKeyHandlerFactory',
);
const getIdentityIdByFirstPublicKeyHandlerFactory = require(
'./getIdentityIdByFirstPublicKeyHandlerFactory',
);
const getIdentitiesByPublicKeyHashesHandlerFactory = require(
'./getIdentitiesByPublicKeyHashesHandlerFactory',
);
Expand Down Expand Up @@ -151,38 +139,6 @@ function platformHandlersFactory(
wrapInErrorHandler(getDataContractHandler),
);

// getIdentityByFirstPublicKey
const getIdentityByFirstPublicKeyHandler = getIdentityByFirstPublicKeyHandlerFactory(
driveStateRepository, handleAbciResponseError,
);

const wrappedGetIdentityByFirstPublicKey = jsonToProtobufHandlerWrapper(
jsonToProtobufFactory(
GetIdentityByFirstPublicKeyRequest,
PBJSGetIdentityByFirstPublicKeyRequest,
),
protobufToJsonFactory(
PBJSGetIdentityByFirstPublicKeyResponse,
),
wrapInErrorHandler(getIdentityByFirstPublicKeyHandler),
);

// getIdentityIdByFirstPublicKey
const getIdentityIdByFirstPublicKeyHandler = getIdentityIdByFirstPublicKeyHandlerFactory(
driveStateRepository, handleAbciResponseError,
);

const wrappedGetIdentityIdByFirstPublicKey = jsonToProtobufHandlerWrapper(
jsonToProtobufFactory(
GetIdentityIdByFirstPublicKeyRequest,
PBJSGetIdentityIdByFirstPublicKeyRequest,
),
protobufToJsonFactory(
PBJSGetIdentityIdByFirstPublicKeyResponse,
),
wrapInErrorHandler(getIdentityIdByFirstPublicKeyHandler),
);

// getIdentitiesByPublicKeyHashes
const getIdentitiesByPublicKeyHashesHandler = getIdentitiesByPublicKeyHashesHandlerFactory(
driveStateRepository, handleAbciResponseError,
Expand Down Expand Up @@ -220,8 +176,6 @@ function platformHandlersFactory(
getIdentity: wrappedGetIdentity,
getDocuments: wrappedGetDocuments,
getDataContract: wrappedGetDataContract,
getIdentityByFirstPublicKey: wrappedGetIdentityByFirstPublicKey,
getIdentityIdByFirstPublicKey: wrappedGetIdentityIdByFirstPublicKey,
getIdentitiesByPublicKeyHashes: wrappedGetIdentitiesByPublicKeyHashes,
getIdentityIdsByPublicKeyHashes: wrappedGetIdentityIdsByPublicKeyHashes,
};
Expand Down
24 changes: 0 additions & 24 deletions test/unit/api/drive/DriveStateRepository.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,28 +151,4 @@ describe('DriveStateRepository', () => {
expect(result).to.be.deep.equal(buffer);
});
});

describe('#fetchPublicKeyIdentityId', () => {
it('Should call \'fetchPublicKeyIdentityId\' RPC with the given parameters', async () => {
const drive = new DriveStateRepository({ host: '127.0.0.1', port: 3000 });

const publicKeyHash = 'somePkHash';
const buffer = Buffer.from('someData');

sinon.stub(drive.client, 'request')
.resolves({
result: {
response: { code: 0, value: buffer.toString('base64') },
},
});

const result = await drive.fetchPublicKeyIdentityId(publicKeyHash);

expect(drive.client.request).to.have.been.calledOnceWithExactly('abci_query', {
path: `/identities/by-first-public-key/${publicKeyHash}/id`,
data: cbor.encode({}).toString('hex'), // cbor encoded empty object
});
expect(result).to.be.deep.equal(buffer);
});
});
});
Loading

0 comments on commit 3aab63c

Please sign in to comment.