🐛 Fixes NFTMethod.unlock to not log event if NFT is escrowed

LiskArchive · Jun 9, 2023 · de66f9e · de66f9e
1 parent 5c1565f
commit de66f9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/framework/src/modules/nft/method.ts b/framework/src/modules/nft/method.ts
@@ -375,23 +375,14 @@ export class NFTMethod extends BaseMethod {
 			throw new Error('NFT substore entry does not exist');
 		}
 
-		const owner = await this.getNFTOwner(methodContext, nftID);
-
-		if (owner.length === LENGTH_CHAIN_ID) {
-			this.events.get(LockEvent).error(
-				methodContext,
-				{
-					module,
-					nftID,
-				},
-				NftEventResult.RESULT_NFT_ESCROWED,
-			);
+		const nftData = await nftStore.get(methodContext, nftID);
 
+		if (nftData.owner.length === LENGTH_CHAIN_ID) {
 			throw new Error('NFT is escrowed to another chain');
 		}
 
 		const userStore = this.stores.get(UserStore);
-		const userKey = userStore.getKey(owner, nftID);
+		const userKey = userStore.getKey(nftData.owner, nftID);
 		const userData = await userStore.get(methodContext, userKey);
 
 		if (userData.lockingModule === NFT_NOT_LOCKED) {

diff --git a/framework/test/unit/modules/nft/method.spec.ts b/framework/test/unit/modules/nft/method.spec.ts
@@ -693,22 +693,10 @@ describe('NFTMethod', () => {
 			);
 		});
 
-		it('should throw and log LockEvent if NFT is escrowed', async () => {
+		it('should throw if NFT is escrowed', async () => {
 			await expect(method.unlock(methodContext, module.name, escrowedNFT.nftID)).rejects.toThrow(
 				'NFT is escrowed to another chain',
 			);
-
-			checkEventResult<LockEventData>(
-				methodContext.eventQueue,
-				1,
-				LockEvent,
-				0,
-				{
-					module: module.name,
-					nftID: escrowedNFT.nftID,
-				},
-				NftEventResult.RESULT_NFT_ESCROWED,
-			);
 		});
 
 		it('should throw and log LockEvent if NFT is not locked', async () => {