rename certain terms in code base (#1280)

- also fix some links as well Signed-off-by: D <d_kelsey@uk.ibm.com>
hyperledger · Mar 23, 2022 · 4f03fef · 4f03fef
1 parent 4356663
commit 4f03fef
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
 # ![Hyperledger Caliper](https://wiki.hyperledger.org/download/attachments/2392434/Hyperledger_Caliper_Logo_Color.svg?version=1&modificationDate=1548883186000&api=v2)
 
-[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/hyperledger/caliper)
-[![Build Status](https://travis-ci.com/hyperledger/caliper.svg?branch=master)](https://travis-ci.com/hyperledger/caliper)
+[![Build Status](https://dev.azure.com/Hyperledger/Caliper/_apis/build/status/Caliper?branchName=main)](https://dev.azure.com/Hyperledger/Caliper/_build/latest?definitionId=33&branchName=main)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2381/badge)](https://bestpractices.coreinfrastructure.org/projects/2381)
-[![license](https://img.shields.io/badge/license-Apache%202.0-blue)](https://github.com/aklenik/caliper/blob/master/LICENSE)
+[![license](https://img.shields.io/badge/license-Apache%202.0-blue)](https://github.com/hyperledger/caliper/blob/main/LICENSE)
 [![node (scoped)](https://img.shields.io/node/v/@hyperledger/caliper-cli)](https://www.npmjs.com/package/@hyperledger/caliper-cli)
 [![npm (scoped)](https://img.shields.io/npm/v/@hyperledger/caliper-cli?label=version)](https://www.npmjs.com/package/@hyperledger/caliper-cli)
 [![npm](https://img.shields.io/npm/dt/@hyperledger/caliper-cli?label=npm%20downloads)](https://www.npmjs.com/package/@hyperledger/caliper-cli)
@@ -26,7 +25,7 @@ Currently supported performance indicators:
 * Transaction/Read latency (minimum, maximum, average)
 * Resource consumption (CPU, Memory, Network IO, ...)
 
-See the [PSWG white paper](https://www.hyperledger.org/resources/publications/blockchain-performance-metrics) to find out the definitions and corresponding measurement methods.  
+See the [PSWG white paper](https://www.hyperledger.org/resources/publications/blockchain-performance-metrics) to find out the definitions and corresponding measurement methods.
 
 For more information on using Caliper, please consult the [documentation site](https://hyperledger.github.io/caliper/)
 

diff --git a/packages/caliper-cli/lib/launch/lib/launchWorker.js b/packages/caliper-cli/lib/launch/lib/launchWorker.js
@@ -25,7 +25,7 @@ class LaunchWorker {
 
     /**
     * Command processing for the Launch Worker command.
-    * @param {object} argv Argument list from the caliper Launch Master command. Unused, relying on ConfigUtil instead.
+    * @param {object} argv Argument list from the caliper Launch manager command. Unused, relying on ConfigUtil instead.
     */
     static async handler(argv) {
         CaliperUtils.assertConfigurationFilePaths();

diff --git a/packages/caliper-core/lib/worker/tx-observers/internal-tx-observer.js b/packages/caliper-core/lib/worker/tx-observers/internal-tx-observer.js
@@ -40,7 +40,7 @@ class InternalTxObserver extends TxObserverInterface {
     }
 
     /**
-     * Sends the current aggregated statistics to the master node when triggered by "setInterval".
+     * Sends the current aggregated statistics to the manager node when triggered by "setInterval".
      * @private
      */
     async _sendUpdate() {

diff --git a/packages/caliper-core/lib/worker/tx-observers/prometheus-push-tx-observer.js b/packages/caliper-core/lib/worker/tx-observers/prometheus-push-tx-observer.js
@@ -107,7 +107,7 @@ class PrometheusPushTxObserver extends TxObserverInterface {
     }
 
     /**
-     * Sends the current aggregated statistics to the master node when triggered by "setInterval".
+     * Sends the current aggregated statistics to the manager node when triggered by "setInterval".
      * @private
      */
     async _sendUpdate() {

diff --git a/packages/caliper-fabric/lib/connector-versions/v1/FabricGateway.js b/packages/caliper-fabric/lib/connector-versions/v1/FabricGateway.js
@@ -127,7 +127,7 @@ class V1FabricGateway extends ConnectorBase {
     }
 
     /**
-     * Initializes the Fabric adapter for use by the Caliper Master
+     * Initializes the Fabric adapter for use by the Caliper Manager
      * @async
      */
     async init() {

diff --git a/packages/caliper-fabric/lib/connector-versions/v2/FabricGateway.js b/packages/caliper-fabric/lib/connector-versions/v2/FabricGateway.js
@@ -121,11 +121,11 @@ class V2FabricGateway extends ConnectorBase {
     }
 
     /**
-     * Initializes the Fabric adapter for use by the Caliper Master
+     * Initializes the Fabric adapter for use by the Caliper Manager
      * @async
      */
     async init() {
-        // Seems to be only for operational initialisation but need to implement as the master
+        // Seems to be only for operational initialisation but need to implement as the manager
         // will call it
         const defaultOrganization = this.connectorConfiguration.getOrganizations()[0];
         const tlsInfo = this.connectorConfiguration.isMutualTLS() ? 'mutual'

diff --git a/packages/caliper-fabric/test/connector-versions/v1/FabricGateway.js b/packages/caliper-fabric/test/connector-versions/v1/FabricGateway.js
@@ -85,13 +85,13 @@ describe('A Node-SDK V1 Fabric Gateway', () => {
         walletFacadeFactory = walletSetup.walletFacadeFactory;
     });
 
-    it('should be able to initialise in preperation for use by a caliper master', async () => {
+    it('should be able to initialise in preperation for use by a caliper manager', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWallet), walletFacadeFactory);
         const fabricGateway = new FabricGateway(connectorConfiguration, 1, 'fabric');
         await fabricGateway.init().should.not.be.rejected;
     });
 
-    it('should be able to initialise in preperation for use by a caliper master when mutual tls is false', async () => {
+    it('should be able to initialise in preperation for use by a caliper manager when mutual tls is false', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWalletNotMutual), walletFacadeFactory);
         const fabricGateway = new FabricGateway(connectorConfiguration, 1, 'fabric');
         await fabricGateway.init().should.not.be.rejected;

diff --git a/packages/caliper-fabric/test/connector-versions/v1/FabricNonGateway.js b/packages/caliper-fabric/test/connector-versions/v1/FabricNonGateway.js
@@ -73,19 +73,19 @@ describe('A Node-SDK V1 Fabric Non Gateway', () => {
         stubWalletFacadeFactory = walletSetup.walletFacadeFactory;
     });
 
-    it('should be able to initialise in preperation for use by a caliper master', async () => {
+    it('should be able to initialise in preperation for use by a caliper manager', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWallet), stubWalletFacadeFactory);
         const fabricNonGateway = new FabricNonGateway(connectorConfiguration, 1, 'fabric');
         await fabricNonGateway.init().should.not.be.rejected;
     });
 
-    it('should be able to initialise in preperation for use by a caliper master when mutual tls is false', async () => {
+    it('should be able to initialise in preperation for use by a caliper manager when mutual tls is false', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWalletNotMutual), stubWalletFacadeFactory);
         const fabricGateway = new FabricNonGateway(connectorConfiguration, 1, 'fabric');
         await fabricGateway.init().should.not.be.rejected;
     });
 
-    it('should throw an error if the connection profile is defined with discover when initalizing for use by caliper master', async () => {
+    it('should throw an error if the connection profile is defined with discover when initalizing for use by caliper manager', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWalletWithDiscover), stubWalletFacadeFactory);
         const fabricNonGateway = new FabricNonGateway(connectorConfiguration, 1, 'fabric');
         await fabricNonGateway.init().should.be.rejectedWith(/Connection profiles for the organization\(s\).*Org1MSP.*have been specified as discover which is not allowed/);

diff --git a/packages/caliper-fabric/test/connector-versions/v2/FabricGateway.js b/packages/caliper-fabric/test/connector-versions/v2/FabricGateway.js
@@ -74,13 +74,13 @@ describe('A Node-SDK V2 Fabric Gateway', () => {
         walletFacadeFactory = walletSetup.walletFacadeFactory;
     });
 
-    it('should be able to initialise in preperation for use by a caliper master', async () => {
+    it('should be able to initialise in preperation for use by a caliper manager', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWallet), walletFacadeFactory);
         const fabricGateway = new FabricGateway(connectorConfiguration, 1, 'fabric');
         await fabricGateway.init().should.not.be.rejected;
     });
 
-    it('should be able to initialise in preperation for use by a caliper master when mutual tls is false', async () => {
+    it('should be able to initialise in preperation for use by a caliper manager when mutual tls is false', async () => {
         const connectorConfiguration = await new ConnectorConfigurationFactory().create(path.resolve(__dirname, configWith2Orgs1AdminInWalletNotMutual), walletFacadeFactory);
         const fabricGateway = new FabricGateway(connectorConfiguration, 1, 'fabric');
         await fabricGateway.init().should.not.be.rejected;

diff --git a/packages/caliper-gui-dashboard/public/index.html b/packages/caliper-gui-dashboard/public/index.html
@@ -21,7 +21,7 @@
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Copyright 2019 Creative Tim (https://www.creative-tim.com)
 
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 
 * Coded by Creative Tim
 

diff --git a/packages/caliper-gui-dashboard/src/assets/css/paper-dashboard.css b/packages/caliper-gui-dashboard/src/assets/css/paper-dashboard.css
@@ -20,7 +20,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/assets/css/paper-dashboard.min.css b/packages/caliper-gui-dashboard/src/assets/css/paper-dashboard.min.css
diff --git a/packages/caliper-gui-dashboard/src/assets/scss/paper-dashboard.scss b/packages/caliper-gui-dashboard/src/assets/scss/paper-dashboard.scss
@@ -20,7 +20,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/components/FixedPlugin/FixedPlugin.jsx b/packages/caliper-gui-dashboard/src/components/FixedPlugin/FixedPlugin.jsx
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/components/Footer/Footer.jsx b/packages/caliper-gui-dashboard/src/components/Footer/Footer.jsx
@@ -18,7 +18,7 @@
 =========================================================
 
 * Author: Jason You
-* GitHub: 
+* GitHub:
 * Licensed under the Apache 2.0 - https://www.apache.org/licenses/LICENSE-2.0
 
 Copyright (c) 2019 Jason You
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/components/Navbars/Navbar.jsx b/packages/caliper-gui-dashboard/src/components/Navbars/Navbar.jsx
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/components/Sidebar/Sidebar.jsx b/packages/caliper-gui-dashboard/src/components/Sidebar/Sidebar.jsx
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/index.js b/packages/caliper-gui-dashboard/src/index.js
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/layouts/Admin.jsx b/packages/caliper-gui-dashboard/src/layouts/Admin.jsx
@@ -18,7 +18,7 @@
 =========================================================
 
 * Author: Jason You
-* GitHub: 
+* GitHub:
 * Licensed under the Apache 2.0 - https://www.apache.org/licenses/LICENSE-2.0
 
 Copyright (c) 2019 Jason You
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/routes.js b/packages/caliper-gui-dashboard/src/routes.js
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-gui-dashboard/src/variables/charts.jsx b/packages/caliper-gui-dashboard/src/variables/charts.jsx
@@ -33,7 +33,7 @@ Copyright (c) 2019 Jason You
 =========================================================
 * Product Page: https://www.creative-tim.com/product/paper-dashboard-react
 * Paper Dashboard React - v1.1.0 Copyright 2019 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard-react/blob/main/LICENSE.md)
 * Coded by Creative Tim
 =========================================================
 

diff --git a/packages/caliper-publish/artifacts/verdaccio-config.yaml b/packages/caliper-publish/artifacts/verdaccio-config.yaml
@@ -17,7 +17,7 @@
 # so don't use it on production systems.
 #
 # Look here for more config file examples:
-# https://github.com/verdaccio/verdaccio/tree/master/conf
+# https://github.com/verdaccio/verdaccio/tree/5.x/conf
 #
 # path to a directory with all packages
 storage: ./storage

diff --git a/packages/caliper-tests-integration/fabric_docker_local_tests/docker-compose.yaml b/packages/caliper-tests-integration/fabric_docker_local_tests/docker-compose.yaml
@@ -258,9 +258,9 @@ services:
         environment:
             DB_URL: http://localhost:5984/member_db
 
-##################
-# CALIPER MASTER #
-##################
+###################
+# CALIPER MANAGER #
+###################
 
     caliper-manager:
         image: caliper:test