[FAB-11827] Rename package names/dirs for validator

In order to be more compliant with the go naming conventions, packages and directories defined to contain 1.2 and 1.3 validation logic should be renamed. Change-Id: If0973e0254e49310771fdcc8c859b0d158f1be47 Signed-off-by: Alessandro Sorniotti <[email protected]> Signed-off-by: Matthias Neugschwandtner <[email protected]>
hyperledger · Sep 1, 2018 · c417075 · c417075
1 parent 2d67d38
commit c417075
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 13 deletions.
diff --git a/core/handlers/validation/builtin/default_validation.go b/core/handlers/validation/builtin/default_validation.go
@@ -17,8 +17,8 @@ import (
 	. "github.com/hyperledger/fabric/core/handlers/validation/api/identities"
 	. "github.com/hyperledger/fabric/core/handlers/validation/api/policies"
 	. "github.com/hyperledger/fabric/core/handlers/validation/api/state"
-	"github.com/hyperledger/fabric/core/handlers/validation/builtin/1.2"
-	"github.com/hyperledger/fabric/core/handlers/validation/builtin/1.3"
+	"github.com/hyperledger/fabric/core/handlers/validation/builtin/v12"
+	"github.com/hyperledger/fabric/core/handlers/validation/builtin/v13"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/pkg/errors"
 )
@@ -129,8 +129,8 @@ func (v *DefaultValidation) Init(dependencies ...validation.Dependency) error {
 	}
 
 	v.Capabilities = c
-	v.TxValidatorV1_2 = builtin1_2.New(c, sf, d, pe)
-	v.TxValidatorV1_3 = builtin1_3.New(c, sf, d, pe)
+	v.TxValidatorV1_2 = v12.New(c, sf, d, pe)
+	v.TxValidatorV1_3 = v13.New(c, sf, d, pe)
 
 	return nil
 }
diff --git a/core/handlers/validation/builtin/default_validation_test.go b/core/handlers/validation/builtin/default_validation_test.go
@@ -12,8 +12,8 @@ import (
 	commonerrors "github.com/hyperledger/fabric/common/errors"
 	"github.com/hyperledger/fabric/core/committer/txvalidator"
 	. "github.com/hyperledger/fabric/core/handlers/validation/api"
-	"github.com/hyperledger/fabric/core/handlers/validation/builtin/1.2/mocks"
 	vmocks "github.com/hyperledger/fabric/core/handlers/validation/builtin/mocks"
+	"github.com/hyperledger/fabric/core/handlers/validation/builtin/v12/mocks"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"

diff --git a/...idation/builtin/1.2/mocks/capabilities.go → ...idation/builtin/v12/mocks/capabilities.go b/...idation/builtin/1.2/mocks/capabilities.go → ...idation/builtin/v12/mocks/capabilities.go
diff --git a/...uiltin/1.2/mocks/identity_deserializer.go → ...uiltin/v12/mocks/identity_deserializer.go b/...uiltin/1.2/mocks/identity_deserializer.go → ...uiltin/v12/mocks/identity_deserializer.go
diff --git a/...ion/builtin/1.2/mocks/policy_evaluator.go → ...ion/builtin/v12/mocks/policy_evaluator.go b/...ion/builtin/1.2/mocks/policy_evaluator.go → ...ion/builtin/v12/mocks/policy_evaluator.go
diff --git a/...dation/builtin/1.2/mocks/state_fetcher.go → ...dation/builtin/v12/mocks/state_fetcher.go b/...dation/builtin/1.2/mocks/state_fetcher.go → ...dation/builtin/v12/mocks/state_fetcher.go
diff --git a/...alidation/builtin/1.2/validation_logic.go → ...alidation/builtin/v12/validation_logic.go b/...alidation/builtin/1.2/validation_logic.go → ...alidation/builtin/v12/validation_logic.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package builtin1_2
+package v12
 
 import (
 	"bytes"

diff --git a/...tion/builtin/1.2/validation_logic_test.go → ...tion/builtin/v12/validation_logic_test.go b/...tion/builtin/1.2/validation_logic_test.go → ...tion/builtin/v12/validation_logic_test.go
@@ -3,7 +3,7 @@ Copyright IBM Corp. All Rights Reserved.
 
 SPDX-License-Identifier: Apache-2.0
 */
-package builtin1_2
+package v12
 
 import (
 	"archive/tar"
@@ -32,7 +32,7 @@ import (
 	"github.com/hyperledger/fabric/core/common/privdata"
 	cutils "github.com/hyperledger/fabric/core/container/util"
 	"github.com/hyperledger/fabric/core/handlers/validation/api/capabilities"
-	"github.com/hyperledger/fabric/core/handlers/validation/builtin/1.2/mocks"
+	"github.com/hyperledger/fabric/core/handlers/validation/builtin/v12/mocks"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
 	per "github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/policy"

diff --git a/...tion/builtin/1.3/lscc_validation_logic.go → ...tion/builtin/v13/lscc_validation_logic.go b/...tion/builtin/1.3/lscc_validation_logic.go → ...tion/builtin/v13/lscc_validation_logic.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package builtin1_3
+package v13
 
 import (
 	"bytes"

diff --git a/...idation/builtin/1.3/mocks/capabilities.go → ...idation/builtin/v13/mocks/capabilities.go b/...idation/builtin/1.3/mocks/capabilities.go → ...idation/builtin/v13/mocks/capabilities.go
diff --git a/...uiltin/1.3/mocks/identity_deserializer.go → ...uiltin/v13/mocks/identity_deserializer.go b/...uiltin/1.3/mocks/identity_deserializer.go → ...uiltin/v13/mocks/identity_deserializer.go
diff --git a/...ion/builtin/1.3/mocks/policy_evaluator.go → ...ion/builtin/v13/mocks/policy_evaluator.go b/...ion/builtin/1.3/mocks/policy_evaluator.go → ...ion/builtin/v13/mocks/policy_evaluator.go
diff --git a/...uiltin/1.3/mocks/state_based_validator.go → ...uiltin/v13/mocks/state_based_validator.go b/...uiltin/1.3/mocks/state_based_validator.go → ...uiltin/v13/mocks/state_based_validator.go
diff --git a/...dation/builtin/1.3/mocks/state_fetcher.go → ...dation/builtin/v13/mocks/state_fetcher.go b/...dation/builtin/1.3/mocks/state_fetcher.go → ...dation/builtin/v13/mocks/state_fetcher.go
diff --git a/...alidation/builtin/1.3/validation_logic.go → ...alidation/builtin/v13/validation_logic.go b/...alidation/builtin/1.3/validation_logic.go → ...alidation/builtin/v13/validation_logic.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package builtin1_3
+package v13
 
 import (
 	"fmt"

diff --git a/...tion/builtin/1.3/validation_logic_test.go → ...tion/builtin/v13/validation_logic_test.go b/...tion/builtin/1.3/validation_logic_test.go → ...tion/builtin/v13/validation_logic_test.go
@@ -3,7 +3,7 @@ Copyright IBM Corp. All Rights Reserved.
 
 SPDX-License-Identifier: Apache-2.0
 */
-package builtin1_3
+package v13
 
 import (
 	"archive/tar"
@@ -33,7 +33,7 @@ import (
 	"github.com/hyperledger/fabric/core/common/privdata"
 	cutils "github.com/hyperledger/fabric/core/container/util"
 	"github.com/hyperledger/fabric/core/handlers/validation/api/capabilities"
-	"github.com/hyperledger/fabric/core/handlers/validation/builtin/1.3/mocks"
+	"github.com/hyperledger/fabric/core/handlers/validation/builtin/v13/mocks"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
 	per "github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/policy"

diff --git a/...dlers/validation/builtin/1.3/validator.go → ...dlers/validation/builtin/v13/validator.go b/...dlers/validation/builtin/1.3/validator.go → ...dlers/validation/builtin/v13/validator.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package builtin1_3
+package v13
 
 import (
 	commonerrors "github.com/hyperledger/fabric/common/errors"