FABN-903 Rename fabric-network classes

Following design review and feedback, rename the following fabric-network classes: Network -> Gateway Channel -> Network Change-Id: Ib30aa1ce00dca573758dd3ea0a0c455519f14c17 Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
hyperledger · Sep 4, 2018 · ba2508f · ba2508f
1 parent 5ce3363
commit ba2508f
Show file tree

Hide file tree

Showing 15 changed files with 1,069 additions and 1,074 deletions.
diff --git a/fabric-network/index.js b/fabric-network/index.js
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-module.exports.Network = require('./lib/network');
+module.exports.Gateway = require('./lib/gateway');
 module.exports.InMemoryWallet = require('./lib/impl/wallet/inmemorywallet');
 module.exports.X509WalletMixin = require('./lib/impl/wallet/x509walletmixin');
 module.exports.FileSystemWallet = require('./lib/impl/wallet/filesystemwallet');

diff --git a/fabric-network/lib/channel.js b/fabric-network/lib/channel.js
diff --git a/fabric-network/lib/contract.js b/fabric-network/lib/contract.js
@@ -11,12 +11,12 @@ const util = require('util');
 
 class Contract {
 
-	constructor(channel, chaincodeId, network, queryHandler, eventHandlerFactory) {
+	constructor(channel, chaincodeId, gateway, queryHandler, eventHandlerFactory) {
 		logger.debug('in Contract constructor');
 
 		this.channel = channel;
 		this.chaincodeId = chaincodeId;
-		this.network = network;
+		this.gateway = gateway;
 		this.queryHandler = queryHandler;
 		this.eventHandlerFactory = eventHandlerFactory;
 	}
@@ -89,7 +89,7 @@ class Contract {
 
 		this._verifyTransactionDetails('submitTransaction', transactionName, parameters);
 
-		const txId = this.network.getClient().newTransactionID();
+		const txId = this.gateway.getClient().newTransactionID();
 		// createTxEventHandler() will return null if no event handler is requested
 		const eventHandler = this.eventHandlerFactory.createTxEventHandler(txId.getTransactionID());
 
@@ -190,7 +190,7 @@ class Contract {
      */
 	async executeTransaction(transactionName, ...parameters) {
 		this._verifyTransactionDetails('executeTransaction', transactionName, parameters);
-		const txId = this.network.getClient().newTransactionID();
+		const txId = this.gateway.getClient().newTransactionID();
 		const result = await this.queryHandler.queryChaincode(this.chaincodeId, txId, transactionName, parameters);
 		return result ? result : null;
 	}

diff --git a/fabric-network/lib/eventstrategies.js b/fabric-network/lib/eventstrategies.js
@@ -9,29 +9,29 @@
 const AllForTxStrategy = require('fabric-network/lib/impl/event/allfortxstrategy');
 const AnyForTxStrategy = require('fabric-network/lib/impl/event/anyfortxstrategy');
 
-function MSPID_SCOPE_ALLFORTX(eventHubFactory, channel, mspId) {
-	const peers = channel.getPeerMap().get(mspId);
+function MSPID_SCOPE_ALLFORTX(eventHubFactory, network, mspId) {
+	const peers = network.getPeerMap().get(mspId);
 	return new AllForTxStrategy(eventHubFactory, peers);
 }
 
-function MSPID_SCOPE_ANYFORTX(eventHubFactory, channel, mspId) {
-	const peers = channel.getPeerMap().get(mspId);
+function MSPID_SCOPE_ANYFORTX(eventHubFactory, network, mspId) {
+	const peers = network.getPeerMap().get(mspId);
 	return new AnyForTxStrategy(eventHubFactory, peers);
 }
 
-function CHANNEL_SCOPE_ALLFORTX(eventHubFactory, channel, mspId) {
-	const peers = channel.getInternalChannel().getPeers();
+function NETWORK_SCOPE_ALLFORTX(eventHubFactory, network, mspId) {
+	const peers = network.getChannel().getPeers();
 	return new AllForTxStrategy(eventHubFactory, peers);
 }
 
-function CHANNEL_SCOPE_ANYFORTX(eventHubFactory, channel, mspId) {
-	const peers = channel.getInternalChannel().getPeers();
+function NETWORK_SCOPE_ANYFORTX(eventHubFactory, network, mspId) {
+	const peers = network.getChannel().getPeers();
 	return new AnyForTxStrategy(eventHubFactory, peers);
 }
 
 module.exports = {
 	MSPID_SCOPE_ALLFORTX,
 	MSPID_SCOPE_ANYFORTX,
-	CHANNEL_SCOPE_ALLFORTX,
-	CHANNEL_SCOPE_ANYFORTX
+	NETWORK_SCOPE_ALLFORTX,
+	NETWORK_SCOPE_ANYFORTX
 };