Upgraded bootstrap (#767)

Co-authored-by: Steven Liu <[email protected]>

Author: fboucquez

e2e/e2e-preset.yml

@@ -1,4 +1,5 @@
+throttlingBurst: 35
+throttlingRate: 1000
 nemesis:
     mosaics:
         - accounts: 10
-symbolRestImage: symbolplatform/symbol-rest:2.1.1-alpha-202011061935

e2e/infrastructure/IntegrationTestHelper.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { map } from 'rxjs/operators';
-import { Addresses, BootstrapService, BootstrapUtils, Preset, StartParams } from 'symbol-bootstrap';
+import { Addresses, BootstrapService, BootstrapUtils, ConfigLoader, StartParams } from 'symbol-bootstrap';
 import { IListener, RepositoryFactory, RepositoryFactoryHttp } from '../../src/infrastructure';
 import { UInt64 } from '../../src/model';
 import { Account } from '../../src/model/account';
@@ -48,26 +48,10 @@ export class IntegrationTestHelper {
     public epochAdjustment: number;
     public bootstrapAddresses: Addresses;
 
-    private async startBootstrapServer(): Promise<{ accounts: string[]; apiUrl: string; addresses: Addresses }> {
-        this.config = {
-            report: false,
-            preset: Preset.bootstrap,
-            reset: this.startEachTime,
-            customPreset: './e2e/e2e-preset.yml',
-            timeout: 60000 * 3,
-            target: 'target/bootstrap-test',
-            detached: false,
-            user: 'current',
-        };
-
-        console.log('Starting bootstrap server');
-        const configResult = await this.service.start({ ...this.config, detached: true });
-        return this.toAccounts(configResult.addresses);
-    }
     private async loadBootstrap(): Promise<{ accounts: string[]; apiUrl: string; addresses: Addresses }> {
-        const target = process.env.REST_DEV || true ? '../catapult-rest/rest/target' : 'target/bootstrap-test';
+        const target = process.env.REST_DEV ? '../catapult-rest/rest/target' : 'target/bootstrap-test';
         console.log('Loading bootstrap server');
-        const addresses = BootstrapUtils.loadExistingAddresses(target);
+        const addresses = new ConfigLoader().loadExistingAddresses(target, false);
         return this.toAccounts(addresses);
     }
 

e2e/infrastructure/PersistentHarvesting.spec.ts

@@ -42,7 +42,7 @@ describe('PersistentHarvesting', () => {
             vrfAccount = Account.createFromPrivateKey('AA798EA9A2D2D202AFCCC82C40A287780BCA3C7F7A2FD5B754832804C6BE1BAA', networkType);
             account = helper.account;
             generationHash = helper.generationHash;
-            nodePublicKey = helper.bootstrapAddresses.nodes![0].signing!.publicKey;
+            nodePublicKey = helper.bootstrapAddresses.nodes![0].transport!.publicKey;
             console.log('Remote: ', remoteAccount.publicAccount);
             console.log('VRF: ', vrfAccount.publicAccount);
             console.log('Node Public Key: ', nodePublicKey);
@@ -110,7 +110,7 @@ describe('PersistentHarvesting', () => {
 
     describe('NodeKeyLinkTransaction', () => {
         it('standalone', async () => {
-            const nodePublicKey = helper.bootstrapAddresses.nodes![0].signing!.publicKey;
+            const nodePublicKey = helper.bootstrapAddresses.nodes![0].transport!.publicKey;
 
             const accountInfo = await helper.repositoryFactory.createAccountRepository().getAccountInfo(account.address).toPromise();
 
@@ -142,7 +142,7 @@ describe('PersistentHarvesting', () => {
 
     describe('transactions', () => {
         it('should create delegated harvesting transaction', async () => {
-            const nodePublicKey = helper.bootstrapAddresses.nodes![0].signing!.publicKey;
+            const nodePublicKey = helper.bootstrapAddresses.nodes![0].transport!.publicKey;
             const tx = PersistentDelegationRequestTransaction.createPersistentDelegationRequestTransaction(
                 Deadline.create(helper.epochAdjustment),
                 remoteAccount.privateKey,