Merge changes I12628628,Ic7d797be

* changes:
  Factor out byte concatenation to utils
  Move core/util to common/util

bddtests/chaincode.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	putils "github.com/hyperledger/fabric/protos/utils"
 )

bddtests/context.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/DATA-DOG/godog"
 	"github.com/DATA-DOG/godog/gherkin"
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 )
 
 // BDDContext represents the current context for the executing scenario.  Commensurate concept of 'context' from behave testing.

bddtests/context_endorser.go

@@ -24,9 +24,9 @@ import (
 
 	"github.com/DATA-DOG/godog"
 	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/platforms"
 	"github.com/hyperledger/fabric/core/container"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
 	"golang.org/x/net/context"

core/util/utils.go → common/util/utils.go

@@ -164,3 +164,21 @@ func GetTestOrgID() string {
 func GetSysCCVersion() string {
 	return metadata.Version
 }
+
+// ConcatenateBytes is useful for combining multiple arrays of bytes, especially for
+// signatures or digests over multiple fields
+func ConcatenateBytes(data ...[]byte) []byte {
+	finalLength := 0
+	for _, slice := range data {
+		finalLength += len(slice)
+	}
+	result := make([]byte, finalLength)
+	last := 0
+	for _, slice := range data {
+		for i := range slice {
+			result[i+last] = slice[i]
+		}
+		last += len(slice)
+	}
+	return result
+}

core/util/utils_test.go → common/util/utils_test.go

@@ -118,3 +118,27 @@ func TestConcurrencyNotFail(t *testing.T) {
 		logger.Info("")
 	}
 }
+
+func TestMetadataSignatureBytesNormal(t *testing.T) {
+	first := []byte("first")
+	second := []byte("second")
+	third := []byte("third")
+
+	result := ConcatenateBytes(first, second, third)
+	expected := []byte("firstsecondthird")
+	if !bytes.Equal(result, expected) {
+		t.Errorf("Did not concatenate bytes correctly, expected %s, got %s", expected, result)
+	}
+}
+
+func TestMetadataSignatureBytesNil(t *testing.T) {
+	first := []byte("first")
+	second := []byte(nil)
+	third := []byte("third")
+
+	result := ConcatenateBytes(first, second, third)
+	expected := []byte("firstthird")
+	if !bytes.Equal(result, expected) {
+		t.Errorf("Did not concatenate bytes correctly, expected %s, got %s", expected, result)
+	}
+}

core/chaincode/chaincodeexec.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

core/chaincode/concurrency_test.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 
 	"golang.org/x/net/context"

core/chaincode/exectransaction_test.go

@@ -28,11 +28,11 @@ import (
 
 	"path/filepath"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	putils "github.com/hyperledger/fabric/protos/utils"
 

core/chaincode/handler.go

@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric/common/util"
 	ccintf "github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/looplab/fsm"
 	logging "github.com/op/go-logging"

core/chaincode/lccc.go

@@ -22,10 +22,10 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/op/go-logging"
 	"golang.org/x/net/context"

core/chaincode/platforms/car/hash.go

@@ -22,7 +22,7 @@ import (
 	"io/ioutil"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

core/chaincode/platforms/car/test/car_test.go

@@ -20,9 +20,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/container"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

core/chaincode/platforms/golang/hash.go

@@ -33,8 +33,8 @@ import (
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 
+	"github.com/hyperledger/fabric/common/util"
 	ccutil "github.com/hyperledger/fabric/core/chaincode/platforms/util"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

core/chaincode/platforms/java/hash.go

@@ -27,8 +27,8 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric/common/util"
 	ccutil "github.com/hyperledger/fabric/core/chaincode/platforms/util"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

core/chaincode/platforms/java/test/java_test.go

@@ -20,9 +20,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/container"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 

core/chaincode/platforms/util/utils.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/hyperledger/fabric/common/util"
 	cutil "github.com/hyperledger/fabric/core/container/util"
-	"github.com/hyperledger/fabric/core/util"
 	"github.com/op/go-logging"
 )
 

core/chaincode/platforms/util/utils_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 )
 
 // TestHashContentChange changes a random byte in a content and checks for hash change

core/chaincode/shim/chaincode.go

@@ -30,8 +30,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/timestamp"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/comm"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"

core/chaincode/sysccapi.go

@@ -21,11 +21,11 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/container/inproccontroller"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/core/util"
 
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"

core/chaincode/systemchaincode_test.go

@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/system_chaincode/samplesyscc"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/viper"
 	"golang.org/x/net/context"

core/chaincode/upgrade_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 
 	"github.com/golang/protobuf/proto"

core/committer/txvalidator/txvalidator_test.go

@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
+	util2 "github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/ledger/testutil"
 	"github.com/hyperledger/fabric/core/ledger/util"
-	util2 "github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"

core/committer/txvalidator/validator.go

@@ -21,11 +21,11 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
+	coreUtil "github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/ledger"
 	ledgerUtil "github.com/hyperledger/fabric/core/ledger/util"
 	"github.com/hyperledger/fabric/core/peer"
-	coreUtil "github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"

core/container/ccintf/ccintf.go

@@ -23,7 +23,7 @@ package ccintf
 import (
 	"encoding/hex"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"golang.org/x/net/context"
 )

core/container/vm_test.go

@@ -24,8 +24,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hyperledger/fabric/common/util"
 	cutil "github.com/hyperledger/fabric/core/container/util"
-	"github.com/hyperledger/fabric/core/util"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"golang.org/x/net/context"
 )

core/endorser/endorser.go

@@ -23,10 +23,10 @@ import (
 	"github.com/op/go-logging"
 	"golang.org/x/net/context"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"

core/endorser/endorser_test.go

@@ -26,11 +26,11 @@ import (
 	"path/filepath"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/peer/msp"
-	"github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/msp"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	pbutils "github.com/hyperledger/fabric/protos/utils"

core/ledger/kvledger/example/app.go

@@ -22,7 +22,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/ledger"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/protos/common"
 	ptestutils "github.com/hyperledger/fabric/protos/testutils"
 )

core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/lockbased_query_executer.go

@@ -17,8 +17,8 @@ limitations under the License.
 package lockbasedtxmgr
 
 import (
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/core/util"
 )
 
 // LockBasedQueryExecutor is a query executor used in `LockBasedTxMgr`

core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/lockbased_tx_simulator.go

@@ -19,8 +19,8 @@ package lockbasedtxmgr
 import (
 	"errors"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwset"
-	"github.com/hyperledger/fabric/core/util"
 )
 
 // LockBasedTxSimulator is a transaction simulator used in `LockBasedTxMgr`

core/ledger/testutil/test_helper.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/protos/common"
 	ptestutils "github.com/hyperledger/fabric/protos/testutils"
 )

core/ledger/testutil/test_util.go

@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )

core/peer/fullflow_test.go

@@ -24,8 +24,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/peer/msp"
-	"github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"

core/peer/msp/config.go

@@ -1,7 +1,7 @@
 package mspmgmt
 
 import (
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"

core/peer/msp/peermsp_test.go

@@ -3,7 +3,7 @@ package mspmgmt
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/core/util"
+	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/msp/testutils"
 )