@@ -96,7 +96,7 @@ var users = hfc.getConfigSetting('users');
9696
9797var transType = uiContent . transType ;
9898var nRequest = parseInt ( uiContent . nRequest ) ;
99- var nThread = parseInt ( uiContent . nThread ) ;
99+ var nProc = parseInt ( uiContent . nProc ) ;
100100var tCurr ;
101101
102102
@@ -109,7 +109,7 @@ var tx_id = null;
109109var nonce = null ;
110110
111111var the_user = null ;
112- var g_len = nThread ;
112+ var g_len = nProc ;
113113
114114var cfgtxFile ;
115115var allEventhubs = [ ] ;
@@ -731,15 +731,17 @@ function pushMSP(client, msps) {
731731 console . log ( '[pushMSP] key: %s, ORGS[key].mspid: %s' , key , ORGS [ key ] . mspid ) ;
732732 if ( key . indexOf ( 'orderer' ) === 0 ) {
733733 var msp = { } ;
734+ var comName = ORGS [ key ] . comName ;
734735 msp . id = ORGS [ key ] . mspid ;
735- msp . rootCerts = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/ordererOrganizations/example.com /msp/' , 'cacerts' ) ) ;
736- msp . admin = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/ordererOrganizations/example.com /msp/' , 'admincerts' ) ) ;
736+ msp . rootCerts = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/ordererOrganizations/' + comName + ' /msp/', 'cacerts' ) ) ;
737+ msp . admin = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/ordererOrganizations/' + comName + ' /msp/', 'admincerts' ) ) ;
737738 msps . push ( client . newMSP ( msp ) ) ;
738739 } else if ( key . indexOf ( 'org' ) === 0 ) {
739740 var msp = { } ;
741+ var comName = ORGS [ key ] . comName ;
740742 msp . id = ORGS [ key ] . mspid ;
741- msp . rootCerts = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/peerOrganizations/' + key + '.example.com /msp/' , 'cacerts' ) ) ;
742- msp . admin = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/peerOrganizations/' + key + '.example.com /msp/' , 'admincerts' ) ) ;
743+ msp . rootCerts = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/peerOrganizations/' + key + '.' + comName + ' /msp/', 'cacerts' ) ) ;
744+ msp . admin = readAllFiles ( path . join ( ORGS [ key ] . mspPath + '/peerOrganizations/' + key + '.' + comName + ' /msp/', 'admincerts' ) ) ;
743745 msps . push ( client . newMSP ( msp ) ) ;
744746 }
745747 }
@@ -755,42 +757,8 @@ function createOneChannel(client, org) {
755757
756758 clientNewOrderer ( client , org ) ;
757759
758- var ACCEPT_ALL = {
759- identities : [ ] ,
760- policy : {
761- '0-of' : [ ]
762- }
763- } ;
764-
765-
766- var test_input3 = {
767- channel : {
768- name : channelName ,
769- consortium : 'SampleConsortium' ,
770- peers : {
771- organizations : [ {
772- id : ORGS [ 'org1' ] . name ,
773- //msp : { mspid : 'Org1MSP'},
774- policies : {
775-
776- }
777- } , {
778- id : ORGS [ 'org2' ] . name ,
779- //msp : { mspid : 'Org2MSP'},
780- policies : {
781-
782- }
783- } ] ,
784- policies : {
785- Admins : { threshold : 'MAJORITY' } ,
786- Writers : { threshold : 'ANY' } ,
787- Readers : { threshold : 'ANY' } ,
788- } ,
789- }
790- }
791- } ;
792-
793760 var config = null ;
761+ var envelope_bytes = null ;
794762 var signatures = [ ] ;
795763 var msps = [ ] ;
796764 var key ;
@@ -804,18 +772,6 @@ function createOneChannel(client, org) {
804772 } )
805773 . then ( ( store ) => {
806774 client . setStateStore ( store ) ;
807- return testUtil . getOrderAdminSubmitter ( client , org , svcFile ) ;
808- } )
809- . then ( ( admin ) => {
810- console . log ( '[createOneChannel] Successfully enrolled user \'admin\' for orderer' ) ;
811- //console.log('test_input3: ', test_input3);
812- //console.log('orderer: ', orderer);
813- //console.log('msps: ', msps);
814- return client . buildChannelConfig ( test_input3 , orderer , msps ) ;
815- } ) . then ( ( config_bytes ) => {
816- console . log ( '\n***\n built config \n***\n' ) ;
817- console . log ( 'Successfully built config update' ) ;
818- config = config_bytes ;
819775
820776 key = 'org1' ;
821777 username = ORGS [ key ] . username ;
@@ -824,8 +780,13 @@ function createOneChannel(client, org) {
824780 return testUtil . getSubmitter ( username , secret , client , true , key , svcFile ) ;
825781 } ) . then ( ( admin ) => {
826782 //the_user = admin;
827- console . log ( '[createOneChannel] admin : ' , admin ) ;
828783 console . log ( '[createOneChannel] Successfully enrolled user \'admin\' for' , key ) ;
784+ var channelTX = channelOpt . channelTX ;
785+ console . log ( '[createOneChannel] channelTX: ' , channelTX ) ;
786+ envelope_bytes = fs . readFileSync ( channelTX ) ;
787+ config = client . extractChannelConfig ( envelope_bytes ) ;
788+ console . log ( '[createOneChannel] Successfull extracted the config update from the configtx envelope: ' , channelTX ) ;
789+
829790 var signature = client . signChannelConfig ( config ) ;
830791 console . log ( '[createOneChannel] Successfully signed config update: ' , key ) ;
831792 // collect signature from org1 admin
@@ -1190,7 +1151,7 @@ function performance_main() {
11901151 }
11911152 } else if ( transType . toUpperCase ( ) == 'INVOKE' ) {
11921153 // spawn off processes for transactions
1193- for ( var j = 0 ; j < nThread ; j ++ ) {
1154+ for ( var j = 0 ; j < nProc ; j ++ ) {
11941155 var workerProcess = child_process . spawn ( 'node' , [ './pte-execRequest.js' , j , Nid , uiFile , tStart , org ] ) ;
11951156
11961157 workerProcess . stdout . on ( 'data' , function ( data ) {
0 commit comments