Skip to content

Commit 289b1a2

Browse files
author
Jason Yellick
committed
Move core/util to common/util
As a matter of policy, the only imports a package should have outside of its base dir are protos/ vendor/ and common/. The core/util package was referenced all over the code, so moving it to common seems like the best option. Change-Id: Ic7d797be6a1b44634480a361ae7469b794685762 Signed-off-by: Jason Yellick <[email protected]>
1 parent 65e0675 commit 289b1a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+55
-56
lines changed

‎bddtests/chaincode.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121

2222
"github.com/golang/protobuf/proto"
23-
"github.com/hyperledger/fabric/core/util"
23+
"github.com/hyperledger/fabric/common/util"
2424
pb "github.com/hyperledger/fabric/protos/peer"
2525
putils "github.com/hyperledger/fabric/protos/utils"
2626
)

‎bddtests/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/DATA-DOG/godog"
2525
"github.com/DATA-DOG/godog/gherkin"
26-
"github.com/hyperledger/fabric/core/util"
26+
"github.com/hyperledger/fabric/common/util"
2727
)
2828

2929
// BDDContext represents the current context for the executing scenario. Commensurate concept of 'context' from behave testing.

‎bddtests/context_endorser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"github.com/DATA-DOG/godog"
2626
"github.com/DATA-DOG/godog/gherkin"
27+
"github.com/hyperledger/fabric/common/util"
2728
"github.com/hyperledger/fabric/core/chaincode/platforms"
2829
"github.com/hyperledger/fabric/core/container"
29-
"github.com/hyperledger/fabric/core/util"
3030
pb "github.com/hyperledger/fabric/protos/peer"
3131
"github.com/hyperledger/fabric/protos/utils"
3232
"golang.org/x/net/context"

‎core/util/utils.go ‎common/util/utils.go

File renamed without changes.

‎core/util/utils_test.go ‎common/util/utils_test.go

File renamed without changes.

‎core/chaincode/chaincodeexec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323

2424
"github.com/golang/protobuf/proto"
25-
"github.com/hyperledger/fabric/core/util"
25+
"github.com/hyperledger/fabric/common/util"
2626
pb "github.com/hyperledger/fabric/protos/peer"
2727
)
2828

‎core/chaincode/concurrency_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"sync"
2222
"testing"
2323

24-
"github.com/hyperledger/fabric/core/util"
24+
"github.com/hyperledger/fabric/common/util"
2525
pb "github.com/hyperledger/fabric/protos/peer"
2626

2727
"golang.org/x/net/context"

‎core/chaincode/exectransaction_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828

2929
"path/filepath"
3030

31+
"github.com/hyperledger/fabric/common/util"
3132
"github.com/hyperledger/fabric/core/container"
3233
"github.com/hyperledger/fabric/core/container/ccintf"
3334
"github.com/hyperledger/fabric/core/ledger"
3435
"github.com/hyperledger/fabric/core/peer"
35-
"github.com/hyperledger/fabric/core/util"
3636
pb "github.com/hyperledger/fabric/protos/peer"
3737
putils "github.com/hyperledger/fabric/protos/utils"
3838

‎core/chaincode/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"time"
2525

2626
"github.com/golang/protobuf/proto"
27+
"github.com/hyperledger/fabric/common/util"
2728
ccintf "github.com/hyperledger/fabric/core/container/ccintf"
2829
"github.com/hyperledger/fabric/core/ledger"
29-
"github.com/hyperledger/fabric/core/util"
3030
pb "github.com/hyperledger/fabric/protos/peer"
3131
"github.com/looplab/fsm"
3232
logging "github.com/op/go-logging"

‎core/chaincode/lccc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"strings"
2323

2424
"github.com/golang/protobuf/proto"
25+
"github.com/hyperledger/fabric/common/util"
2526
"github.com/hyperledger/fabric/core/chaincode/shim"
2627
"github.com/hyperledger/fabric/core/ledger"
2728
"github.com/hyperledger/fabric/core/peer"
28-
"github.com/hyperledger/fabric/core/util"
2929
pb "github.com/hyperledger/fabric/protos/peer"
3030
"github.com/op/go-logging"
3131
"golang.org/x/net/context"

‎core/chaincode/platforms/car/hash.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"io/ioutil"
2323

2424
"github.com/golang/protobuf/proto"
25-
"github.com/hyperledger/fabric/core/util"
25+
"github.com/hyperledger/fabric/common/util"
2626
pb "github.com/hyperledger/fabric/protos/peer"
2727
)
2828

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"os"
2121
"testing"
2222

23+
"github.com/hyperledger/fabric/common/util"
2324
"github.com/hyperledger/fabric/core/config"
2425
"github.com/hyperledger/fabric/core/container"
25-
"github.com/hyperledger/fabric/core/util"
2626
pb "github.com/hyperledger/fabric/protos/peer"
2727
)
2828

‎core/chaincode/platforms/golang/hash.go

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"github.com/op/go-logging"
3434
"github.com/spf13/viper"
3535

36+
"github.com/hyperledger/fabric/common/util"
3637
ccutil "github.com/hyperledger/fabric/core/chaincode/platforms/util"
37-
"github.com/hyperledger/fabric/core/util"
3838
pb "github.com/hyperledger/fabric/protos/peer"
3939
)
4040

‎core/chaincode/platforms/java/hash.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"strings"
2828

2929
"github.com/golang/protobuf/proto"
30+
"github.com/hyperledger/fabric/common/util"
3031
ccutil "github.com/hyperledger/fabric/core/chaincode/platforms/util"
31-
"github.com/hyperledger/fabric/core/util"
3232
pb "github.com/hyperledger/fabric/protos/peer"
3333
)
3434

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"os"
2121
"testing"
2222

23+
"github.com/hyperledger/fabric/common/util"
2324
"github.com/hyperledger/fabric/core/config"
2425
"github.com/hyperledger/fabric/core/container"
25-
"github.com/hyperledger/fabric/core/util"
2626
pb "github.com/hyperledger/fabric/protos/peer"
2727
)
2828

‎core/chaincode/platforms/util/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"os"
99
"path/filepath"
1010

11+
"github.com/hyperledger/fabric/common/util"
1112
cutil "github.com/hyperledger/fabric/core/container/util"
12-
"github.com/hyperledger/fabric/core/util"
1313
"github.com/op/go-logging"
1414
)
1515

‎core/chaincode/platforms/util/utils_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/hyperledger/fabric/core/util"
10+
"github.com/hyperledger/fabric/common/util"
1111
)
1212

1313
// TestHashContentChange changes a random byte in a content and checks for hash change

‎core/chaincode/shim/chaincode.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030

3131
"github.com/golang/protobuf/proto"
3232
"github.com/golang/protobuf/ptypes/timestamp"
33+
"github.com/hyperledger/fabric/common/util"
3334
"github.com/hyperledger/fabric/core/comm"
34-
"github.com/hyperledger/fabric/core/util"
3535
pb "github.com/hyperledger/fabric/protos/peer"
3636
"github.com/op/go-logging"
3737
"github.com/spf13/viper"

‎core/chaincode/sysccapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121

2222
"golang.org/x/net/context"
2323

24+
"github.com/hyperledger/fabric/common/util"
2425
"github.com/hyperledger/fabric/core/chaincode/shim"
2526
"github.com/hyperledger/fabric/core/container/inproccontroller"
2627
"github.com/hyperledger/fabric/core/ledger"
2728
"github.com/hyperledger/fabric/core/peer"
28-
"github.com/hyperledger/fabric/core/util"
2929

3030
"github.com/op/go-logging"
3131
"github.com/spf13/viper"

‎core/chaincode/systemchaincode_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"testing"
2323
"time"
2424

25+
"github.com/hyperledger/fabric/common/util"
2526
"github.com/hyperledger/fabric/core/peer"
2627
"github.com/hyperledger/fabric/core/system_chaincode/samplesyscc"
27-
"github.com/hyperledger/fabric/core/util"
2828
pb "github.com/hyperledger/fabric/protos/peer"
2929
"github.com/spf13/viper"
3030
"golang.org/x/net/context"

‎core/chaincode/upgrade_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"testing"
2323

24-
"github.com/hyperledger/fabric/core/util"
24+
"github.com/hyperledger/fabric/common/util"
2525
pb "github.com/hyperledger/fabric/protos/peer"
2626

2727
"github.com/golang/protobuf/proto"

‎core/committer/txvalidator/txvalidator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"testing"
2121

2222
"github.com/golang/protobuf/proto"
23+
util2 "github.com/hyperledger/fabric/common/util"
2324
"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
2425
"github.com/hyperledger/fabric/core/ledger/testutil"
2526
"github.com/hyperledger/fabric/core/ledger/util"
26-
util2 "github.com/hyperledger/fabric/core/util"
2727
"github.com/hyperledger/fabric/protos/common"
2828
pb "github.com/hyperledger/fabric/protos/peer"
2929
"github.com/hyperledger/fabric/protos/utils"

‎core/committer/txvalidator/validator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
"fmt"
2222

2323
"github.com/golang/protobuf/proto"
24+
coreUtil "github.com/hyperledger/fabric/common/util"
2425
"github.com/hyperledger/fabric/core/chaincode"
2526
"github.com/hyperledger/fabric/core/ledger"
2627
ledgerUtil "github.com/hyperledger/fabric/core/ledger/util"
2728
"github.com/hyperledger/fabric/core/peer"
28-
coreUtil "github.com/hyperledger/fabric/core/util"
2929
"github.com/hyperledger/fabric/protos/common"
3030
"github.com/hyperledger/fabric/protos/utils"
3131
"github.com/op/go-logging"

‎core/container/ccintf/ccintf.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package ccintf
2323
import (
2424
"encoding/hex"
2525

26-
"github.com/hyperledger/fabric/core/util"
26+
"github.com/hyperledger/fabric/common/util"
2727
pb "github.com/hyperledger/fabric/protos/peer"
2828
"golang.org/x/net/context"
2929
)

‎core/container/vm_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"os"
2525
"testing"
2626

27+
"github.com/hyperledger/fabric/common/util"
2728
cutil "github.com/hyperledger/fabric/core/container/util"
28-
"github.com/hyperledger/fabric/core/util"
2929
pb "github.com/hyperledger/fabric/protos/peer"
3030
"golang.org/x/net/context"
3131
)

‎core/endorser/endorser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"github.com/op/go-logging"
2424
"golang.org/x/net/context"
2525

26+
"github.com/hyperledger/fabric/common/util"
2627
"github.com/hyperledger/fabric/core/chaincode"
2728
"github.com/hyperledger/fabric/core/ledger"
2829
"github.com/hyperledger/fabric/core/peer"
29-
"github.com/hyperledger/fabric/core/util"
3030
"github.com/hyperledger/fabric/msp"
3131
"github.com/hyperledger/fabric/protos/common"
3232
pb "github.com/hyperledger/fabric/protos/peer"

‎core/endorser/endorser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"path/filepath"
2727

2828
"github.com/golang/protobuf/proto"
29+
"github.com/hyperledger/fabric/common/util"
2930
"github.com/hyperledger/fabric/core/chaincode"
3031
"github.com/hyperledger/fabric/core/container"
3132
"github.com/hyperledger/fabric/core/peer"
3233
"github.com/hyperledger/fabric/core/peer/msp"
33-
"github.com/hyperledger/fabric/core/util"
3434
"github.com/hyperledger/fabric/msp"
3535
pb "github.com/hyperledger/fabric/protos/peer"
3636
pbutils "github.com/hyperledger/fabric/protos/utils"

‎core/ledger/kvledger/example/app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/golang/protobuf/proto"
2323
"github.com/hyperledger/fabric/core/ledger"
2424

25-
"github.com/hyperledger/fabric/core/util"
25+
"github.com/hyperledger/fabric/common/util"
2626
"github.com/hyperledger/fabric/protos/common"
2727
ptestutils "github.com/hyperledger/fabric/protos/testutils"
2828
)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package lockbasedtxmgr
1818

1919
import (
20+
"github.com/hyperledger/fabric/common/util"
2021
"github.com/hyperledger/fabric/core/ledger"
21-
"github.com/hyperledger/fabric/core/util"
2222
)
2323

2424
// LockBasedQueryExecutor is a query executor used in `LockBasedTxMgr`

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package lockbasedtxmgr
1919
import (
2020
"errors"
2121

22+
"github.com/hyperledger/fabric/common/util"
2223
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwset"
23-
"github.com/hyperledger/fabric/core/util"
2424
)
2525

2626
// LockBasedTxSimulator is a transaction simulator used in `LockBasedTxMgr`

‎core/ledger/testutil/test_helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"testing"
2121

2222
"github.com/golang/protobuf/proto"
23-
"github.com/hyperledger/fabric/core/util"
23+
"github.com/hyperledger/fabric/common/util"
2424
"github.com/hyperledger/fabric/protos/common"
2525
ptestutils "github.com/hyperledger/fabric/protos/testutils"
2626
)

‎core/ledger/testutil/test_util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"testing"
2929
"time"
3030

31-
"github.com/hyperledger/fabric/core/util"
31+
"github.com/hyperledger/fabric/common/util"
3232
"github.com/op/go-logging"
3333
"github.com/spf13/viper"
3434
)

‎core/peer/fullflow_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"fmt"
2525
"os"
2626

27+
"github.com/hyperledger/fabric/common/util"
2728
"github.com/hyperledger/fabric/core/peer/msp"
28-
"github.com/hyperledger/fabric/core/util"
2929
"github.com/hyperledger/fabric/msp"
3030
"github.com/hyperledger/fabric/protos/peer"
3131
"github.com/hyperledger/fabric/protos/utils"

‎core/peer/msp/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mspmgmt
22

33
import (
4-
"github.com/hyperledger/fabric/core/util"
4+
"github.com/hyperledger/fabric/common/util"
55
"github.com/hyperledger/fabric/msp"
66
"github.com/hyperledger/fabric/protos/common"
77
mspprotos "github.com/hyperledger/fabric/protos/msp"

‎core/peer/msp/peermsp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package mspmgmt
33
import (
44
"testing"
55

6-
"github.com/hyperledger/fabric/core/util"
6+
"github.com/hyperledger/fabric/common/util"
77
"github.com/hyperledger/fabric/msp"
88
"github.com/hyperledger/fabric/protos/msp/testutils"
99
)

‎core/system_chaincode/escc/endorser_onevalidsignature_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323

2424
"os"
2525

26+
"github.com/hyperledger/fabric/common/util"
2627
"github.com/hyperledger/fabric/core/chaincode/shim"
2728
"github.com/hyperledger/fabric/core/peer"
2829
"github.com/hyperledger/fabric/core/peer/msp"
29-
"github.com/hyperledger/fabric/core/util"
3030
pb "github.com/hyperledger/fabric/protos/peer"
3131
putils "github.com/hyperledger/fabric/protos/utils"
3232
)

‎core/system_chaincode/vscc/validator_onevalidsignature_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"fmt"
2222
"os"
2323

24+
"github.com/hyperledger/fabric/common/util"
2425
"github.com/hyperledger/fabric/core/chaincode/shim"
2526
"github.com/hyperledger/fabric/core/peer/msp"
26-
"github.com/hyperledger/fabric/core/util"
2727
"github.com/hyperledger/fabric/msp"
2828
"github.com/hyperledger/fabric/protos/common"
2929
"github.com/hyperledger/fabric/protos/peer"

‎examples/chaincode/go/asset_management_interactive/app1/app1_internal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import (
2222
"fmt"
2323

2424
"github.com/golang/protobuf/proto"
25+
"github.com/hyperledger/fabric/common/util"
2526
"github.com/hyperledger/fabric/core/chaincode"
2627
"github.com/hyperledger/fabric/core/chaincode/platforms"
2728
"github.com/hyperledger/fabric/core/config"
2829
"github.com/hyperledger/fabric/core/container"
2930
"github.com/hyperledger/fabric/core/crypto"
3031
"github.com/hyperledger/fabric/core/peer"
31-
"github.com/hyperledger/fabric/core/util"
3232
pb "github.com/hyperledger/fabric/protos"
3333
"github.com/op/go-logging"
3434
"github.com/spf13/viper"

‎examples/chaincode/go/asset_management_interactive/app2/app2_internal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"strings"
2727

2828
"github.com/golang/protobuf/proto"
29+
"github.com/hyperledger/fabric/common/util"
2930
"github.com/hyperledger/fabric/core/chaincode"
3031
"github.com/hyperledger/fabric/core/chaincode/platforms"
3132
"github.com/hyperledger/fabric/core/config"
3233
"github.com/hyperledger/fabric/core/container"
3334
"github.com/hyperledger/fabric/core/crypto"
3435
"github.com/hyperledger/fabric/core/peer"
35-
"github.com/hyperledger/fabric/core/util"
3636
pb "github.com/hyperledger/fabric/protos"
3737
"github.com/op/go-logging"
3838
"github.com/spf13/viper"

0 commit comments

Comments
 (0)