[FAB-4337] Fix proto style in batchsize config msg

This is a proto message that slipped through the proto style
normalization.

It's a safe change from a go API perspective, and it is ABI compatible
with the existing protos, so no existing consumers should be affected.

This is important to fix however, because reconfiguration is finally
available, and these field names are finally user visible.  Fixing this
soon should have minimal impact, but may have more impact in the future
once more people are familiar with the config contents.

Change-Id: I7b21f72776088e66be45c72ed869a43b7153b0d5
Signed-off-by: Jason Yellick <[email protected]>

Author: Jason Yellick

examples/configtxupdate/README.md

@@ -1,4 +1,4 @@
-# Reconfiguraing with configtxlator
+# Reconfiguring with configtxlator
 
 ## Overview
 
@@ -92,7 +92,7 @@ curl -X POST --data-binary @genesis_block.proto http://127.0.0.1:7059/protolator
 ```
 Edit the `genesis_block.json` file in your favorite JSON editor, or manipulate it programatically, here, we use the JSON CLI tool `jq`.  For simplicity, we are editing the batch size for the channel, because it is a single numeric field, but any edits, including policy and MSP edits may be made here.
 ```
-$ export MAXBATCHSIZEPATH=".data.data[0].payload.data.config.channel_group.groups.Orderer.values.BatchSize.value.maxMessageCount"
+$ export MAXBATCHSIZEPATH=".data.data[0].payload.data.config.channel_group.groups.Orderer.values.BatchSize.value.max_message_count"
 # Display the old batch size
 $ jq "$MAXBATCHSIZEPATH" genesis_block.json 
 10
@@ -176,7 +176,7 @@ jq .data.data[0].payload.data.config config_block.json > config.json
 Edit the config, saving it as a new `updated_config.json`.  Here, we set the batch size to 30.
 
 ```
-jq ".channel_group.groups.Orderer.values.BatchSize.value.maxMessageCount = 30" config.json  > updated_config.json
+jq ".channel_group.groups.Orderer.values.BatchSize.value.max_message_count = 30" config.json  > updated_config.json
 ```
 
 Re-encode both the original config, and the updated config into proto.

examples/configtxupdate/bootstrapping/script.sh

@@ -29,7 +29,7 @@ curl -X POST --data-binary @genesis_block.proto http://127.0.0.1:7059/protolator
 
 bigMsg "Updating genesis config"
 
-jq ".data.data[0].payload.data.config.channel_group.groups.Orderer.values.BatchSize.value.maxMessageCount" genesis_block.json > updated_genesis_block.json
+jq ".data.data[0].payload.data.config.channel_group.groups.Orderer.values.BatchSize.value.max_message_count = 20" genesis_block.json > updated_genesis_block.json
 
 bigMsg "Re-encoding the updated genesis block"
 

examples/configtxupdate/reconfig/script.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+CHANNEL=testchainid
+
 die() {
     echo "$1"
     exit 1
@@ -21,7 +23,7 @@ PEER=../../../build/bin/peer
 
 bigMsg "Fetching current config block"
 
-$PEER channel fetch config config_block.proto -o 127.0.0.1:7050 -c testchainid || die "Unable to fetch config block"
+$PEER channel fetch config config_block.proto -o 127.0.0.1:7050 -c $CHANNEL || die "Unable to fetch config block"
 
 bigMsg "Decoding current config block"
 
@@ -33,10 +35,10 @@ jq .data.data[0].payload.data.config config_block.json > config.json || die "Una
 
 bigMsg "Generating new config"
 
-OLD_BATCH_SIZE=$(jq ".channel_group.groups.Orderer.values.BatchSize.value.maxMessageCount" config.json)
+OLD_BATCH_SIZE=$(jq ".channel_group.groups.Orderer.values.BatchSize.value.max_message_count" config.json)
 NEW_BATCH_SIZE=$(($OLD_BATCH_SIZE+1))
 
-jq ".channel_group.groups.Orderer.values.BatchSize.value.maxMessageCount = $NEW_BATCH_SIZE" config.json  > updated_config.json || die "Error updating batch size"
+jq ".channel_group.groups.Orderer.values.BatchSize.value.max_message_count = $NEW_BATCH_SIZE" config.json  > updated_config.json || die "Error updating batch size"
 
 bigMsg "Translating original config to proto"
 
@@ -48,22 +50,22 @@ curl -X POST --data-binary @updated_config.json http://127.0.0.1:7059/protolator
 
 bigMsg "Computing config update"
 
-curl -X POST -F [email protected] -F updated=@updated_config.proto http://127.0.0.1:7059/configtxlator/compute/update-from-configs -F channel=testchainid > config_update.proto || die "Error computing config update"
+curl -X POST -F [email protected] -F updated=@updated_config.proto http://127.0.0.1:7059/configtxlator/compute/update-from-configs -F channel=$CHANNEL > config_update.proto || die "Error computing config update"
 
 bigMsg "Decoding config update"
 
 curl -X POST --data-binary @config_update.proto http://127.0.0.1:7059/protolator/decode/common.ConfigUpdate > config_update.json || die "Error decoding config update"
 
 bigMsg "Generating config update envelope"
 
-echo '{"payload":{"header":{"channel_header":{"channel_id":"testchainid", "type":2}},"data":{"config_update":'$(cat config_update.json)'}}}' > config_update_as_envelope.json || die "Error creating config update envelope"
+echo '{"payload":{"header":{"channel_header":{"channel_id":"'$CHANNEL'", "type":2}},"data":{"config_update":'$(cat config_update.json)'}}}' > config_update_as_envelope.json || die "Error creating config update envelope"
 
 bigMsg "Encoding config update envelope"
 
 curl -X POST --data-binary @config_update_as_envelope.json http://127.0.0.1:7059/protolator/encode/common.Envelope > config_update_as_envelope.proto || die "Error converting envelope to proto"
 
 bigMsg "Sending config update to channel"
 
-$PEER channel update -f config_update_as_envelope.proto -c testchainid -o 127.0.0.1:7050 || die "Error updating channel"
+$PEER channel update -f config_update_as_envelope.proto -c $CHANNEL -o 127.0.0.1:7050 || die "Error updating channel"
 
 bigMsg "Config Update Successful!"

protos/orderer/configuration.pb.go

@@ -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 {