Added interface,

Author: rg911

e2e/service/BlockService.spec.ts

@@ -48,7 +48,7 @@ describe('BlockService', () => {
             networkType = helper.networkType;
             transactionRepository = helper.repositoryFactory.createTransactionRepository();
             receiptRepository = helper.repositoryFactory.createReceiptRepository();
-            blockService = new BlockService(helper.repositoryFactory.createBlockRepository(), receiptRepository);
+            blockService = new BlockService(helper.repositoryFactory);
         });
     });
     before(() => {
@@ -102,9 +102,9 @@ describe('BlockService', () => {
 
     describe('Validate receipt', () => {
         it('call block service', async () => {
-            const statement = await receiptRepository.getBlockReceipts(UInt64.fromUint(1)).toPromise();
-            const receipt = statement.transactionStatements[0];
-            const validationResult = await blockService.validateReceiptInBlock(receipt.generateHash(), UInt64.fromUint(1)).toPromise();
+            const statements = await receiptRepository.getBlockReceipts(UInt64.fromUint(1)).toPromise();
+            const statement = statements.transactionStatements[0];
+            const validationResult = await blockService.validateStatementInBlock(statement.generateHash(), UInt64.fromUint(1)).toPromise();
             expect(validationResult).to.be.true;
         });
     });

src/service/BlockService.ts

@@ -19,20 +19,24 @@ import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { BlockRepository } from '../infrastructure/BlockRepository';
 import { ReceiptRepository } from '../infrastructure/ReceiptRepository';
+import { RepositoryFactory } from '../infrastructure/RepositoryFactory';
 import { MerklePathItem } from '../model/blockchain/MerklePathItem';
 import { UInt64 } from '../model/UInt64';
 
 /**
  * Transaction Service
  */
 export class BlockService {
+    private readonly blockRepository: BlockRepository;
+    private readonly receiptRepository: ReceiptRepository;
 
     /**
      * Constructor
-     * @param blockRepository
-     * @param receiptRepository
+     * @param repositoryFactory
      */
-    constructor(private readonly blockRepository: BlockRepository, private readonly receiptRepository: ReceiptRepository) {
+    constructor(public readonly repositoryFactory: RepositoryFactory) {
+        this.blockRepository = repositoryFactory.createBlockRepository();
+        this.receiptRepository = repositoryFactory.createReceiptRepository();
     }
 
     /**
@@ -49,11 +53,11 @@ export class BlockService {
     }
 
     /**
-     * Validate receipt hash in block
-     * @param leaf receipt hash
+     * Validate statement hash in block
+     * @param leaf statement hash
      * @param height block height
      */
-    public validateReceiptInBlock(leaf: string, height: UInt64): Observable<boolean> {
+    public validateStatementInBlock(leaf: string, height: UInt64): Observable<boolean> {
         const rootHashObservable = this.blockRepository.getBlockByHeight(height);
         const merklePathItemObservable = this.receiptRepository.getMerkleReceipts(height, leaf);
         return combineLatest(rootHashObservable, merklePathItemObservable).pipe(

src/service/interfaces/IBlockService.ts

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Observable } from 'rxjs';
+import { UInt64 } from '../../model/UInt64';
+
+/**
+ * Block Service Interface
+ */
+export interface IBlockService {
+
+    /**
+     * Validate transaction hash in block
+     * @param leaf transaction hash
+     * @param height block height
+     */
+    validateTransactionInBlock(leaf: string, height: UInt64): Observable<boolean>;
+
+    /**
+     * Validate statement hash in block
+     * @param leaf statement hash
+     * @param height block height
+     */
+    validateStatementInBlock(leaf: string, height: UInt64): Observable<boolean>;
+}