Revert accidental changes to original end-to-end

FAB-2619
some changes went in by accident that got the original
test/integration/end-to-end.js to target the new "mychannel"
with new msp ids. it should have been kept on the default config
and left the new config to the new test/integration/e2e.js

Change-Id: Id18fd119f5e39a790c86868fdee0474cb2b19580
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>

test/integration/end-to-end.js

@@ -41,16 +41,16 @@ var EventHub = require('fabric-client/lib/EventHub.js');
 
 var chaincode_id = 'end2end';
 var chaincode_version = 'v0';
-var chain_id = 'mychannel';
+var chain_id = 'testchainid';
 
 var client = new hfc();
 var chain = client.newChain(chain_id);
 
 var tx_id = null;
 var nonce = null;
 var the_user = null;
-var peer0 = new Peer('grpc://localhost:8051'),
-	peer1 = new Peer('grpc://localhost:8056');
+var peer0 = new Peer('grpc://localhost:7051'),
+	peer1 = new Peer('grpc://localhost:7056');
 
 var steps = [];
 if (process.argv.length > 2) {
@@ -73,19 +73,19 @@ chain.addPeer(peer1);
 test('End-to-end flow of chaincode install, instantiate, transaction invocation, and query', (t) => {
 
 	hfc.newDefaultKeyValueStore({
-		path: testUtil.storePathForOrg('org2')
+		path: testUtil.KVS
 	}).then((store) => {
 		client.setStateStore(store);
-		var promise = testUtil.getSubmitter(client, t, 'org2');
+		var promise = testUtil.getSubmitter(client, t);
 
 		// setup event hub for peer0 to get notified when transactions are committed
 		var eh1 = new EventHub();
-		eh1.setPeerAddr('grpc://localhost:8053');
+		eh1.setPeerAddr('grpc://localhost:7053');
 		eh1.connect();
 
 		// setup event hub or peer1 to get notified when transactions are committed
 		var eh2 = new EventHub();
-		eh2.setPeerAddr('grpc://localhost:8058');
+		eh2.setPeerAddr('grpc://localhost:7058');
 		eh2.connect();
 
 		// override t.end function so it'll always disconnect the event hub
@@ -110,8 +110,6 @@ test('End-to-end flow of chaincode install, instantiate, transaction invocation,
 				t.pass('Successfully enrolled user \'admin\'');
 				the_user = admin;
 
-				the_user.mspImpl._id = 'Org2MSP';
-
 				nonce = utils.getNonce();
 				tx_id = chain.buildTransactionID(nonce, the_user);
 

test/unit/util.js

@@ -185,7 +185,7 @@ module.exports.getSubmitter = function(client, test, loadFromConfig, org) {
 		if (typeof org === 'string') {
 			userOrg = org;
 		} else {
-			userOrg = 'peerOrg1';
+			userOrg = 'org1';
 		}
 	}