[FAB-4441] NodeSDK update protos to current

Update the NodeSDK order/configuration.proto to current fabric Change-Id: Ice08bdfd11e066a52ad7f2485a4ad50044a2df6b Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
hyperledger · Jun 7, 2017 · a05c55c · a05c55c
1 parent 4f03644
commit a05c55c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/fabric-client/lib/BlockDecoder.js b/fabric-client/lib/BlockDecoder.js
@@ -246,9 +246,9 @@ actions
                   version -- {int}
                   mod_policy -- {string}
                   value
-                     maxMessageCount -- {int}
-                     absoluteMaxBytes -- {int}
-                     preferredMaxBytes -- {int}
+                     max_message_count -- {int}
+                     absolute_max_bytes -- {int}
+                     preferred_max_bytes -- {int}
                BatchTimeout
                   version -- {int}
                   mod_policy -- {string}
@@ -733,9 +733,9 @@ function decodeConfigValue(proto_config_value) {
 		break;
 	case 'BatchSize':
 		var proto_batch_size = _ordererConfigurationProto.BatchSize.decode(proto_config_value.value.value);
-		config_value.value.maxMessageCount = proto_batch_size.getMaxMessageCount(); //uint32
-		config_value.value.absoluteMaxBytes = proto_batch_size.getAbsoluteMaxBytes(); //uint32
-		config_value.value.preferredMaxBytes = proto_batch_size.getPreferredMaxBytes(); //uint32
+		config_value.value.max_message_count = proto_batch_size.getMaxMessageCount(); //uint32
+		config_value.value.absolute_max_bytes = proto_batch_size.getAbsoluteMaxBytes(); //uint32
+		config_value.value.preferred_max_bytes = proto_batch_size.getPreferredMaxBytes(); //uint32
 		break;
 	case 'BatchTimeout':
 		var proto_batch_timeout = _ordererConfigurationProto.BatchTimeout.decode(proto_config_value.value.value);

diff --git a/fabric-client/lib/Channel.js b/fabric-client/lib/Channel.js
@@ -1757,9 +1757,9 @@ function loadConfigValue(config_items, versions, config_value, group_name, org)
 		case 'BatchSize':
 			var batch_size = _ordererConfigurationProto.BatchSize.decode(config_value.value.value);
 			config_items.settings['BatchSize'] = batch_size;
-			logger.debug('loadConfigValue - %s    - BatchSize  maxMessageCount :: %s', group_name, batch_size.maxMessageCount);
-			logger.debug('loadConfigValue - %s    - BatchSize  absoluteMaxBytes :: %s', group_name, batch_size.absoluteMaxBytes);
-			logger.debug('loadConfigValue - %s    - BatchSize  preferredMaxBytes :: %s', group_name, batch_size.preferredMaxBytes);
+			logger.debug('loadConfigValue - %s    - BatchSize  max_message_count :: %s', group_name, batch_size.maxMessageCount);
+			logger.debug('loadConfigValue - %s    - BatchSize  absolute_max_bytes :: %s', group_name, batch_size.absoluteMaxBytes);
+			logger.debug('loadConfigValue - %s    - BatchSize  preferred_max_bytes :: %s', group_name, batch_size.preferredMaxBytes);
 			break;
 		case 'BatchTimeout':
 			var batch_timeout = _ordererConfigurationProto.BatchTimeout.decode(config_value.value.value);

diff --git a/fabric-client/lib/protos/orderer/configuration.proto b/fabric-client/lib/protos/orderer/configuration.proto
@@ -35,13 +35,13 @@ message ConsensusType {
 message BatchSize {
     // Simply specified as number of messages for now, in the future
     // we may want to allow this to be specified by size in bytes
-    uint32 maxMessageCount = 1;
+    uint32 max_message_count = 1;
     // The byte count of the serialized messages in a batch cannot
     // exceed this value.
-    uint32 absoluteMaxBytes = 2;
+    uint32 absolute_max_bytes = 2;
     // The byte count of the serialized messages in a batch should not
     // exceed this value.
-    uint32 preferredMaxBytes = 3;
+    uint32 preferred_max_bytes = 3;
 }
 
 message BatchTimeout {