Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to new repository #54

Merged
merged 2 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
go-version: 1.18

- name: Build
run: go build -v github.com/goledgerdev/cc-tools-demo/chaincode
run: go build -v github.com/hyperledger-labs/cc-tools-demo/chaincode

- name: Test
run: go test github.com/goledgerdev/cc-tools-demo/chaincode -coverpkg=./... -v
run: go test github.com/hyperledger-labs/cc-tools-demo/chaincode -coverpkg=./... -v
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"go.testFlags": [
"-v",
"-coverpkg=github.com/goledgerdev/cc-tools-demo/chaincode/..."
"-coverpkg=github.com/hyperledger-labs/cc-tools-demo/chaincode/..."
]
}
2 changes: 1 addition & 1 deletion ccapi/chaincode/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"regexp"

"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/common"
ev "github.com/hyperledger/fabric-sdk-go/pkg/client/event"
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
)
Expand Down
2 changes: 1 addition & 1 deletion ccapi/chaincode/invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"os"

"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/common"
"github.com/hyperledger/fabric-sdk-go/pkg/client/channel"
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/retry"
)
Expand Down
2 changes: 1 addition & 1 deletion ccapi/chaincode/invokeGateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package chaincode
import (
"os"

"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/common"
"github.com/hyperledger/fabric-gateway/pkg/client"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion ccapi/chaincode/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"os"

"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/common"
"github.com/hyperledger/fabric-sdk-go/pkg/client/channel"
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/retry"
)
Expand Down
2 changes: 1 addition & 1 deletion ccapi/chaincode/queryGateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package chaincode
import (
"os"

"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/common"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion ccapi/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/goledgerdev/ccapi
module github.com/hyperledger-labs/ccapi

go 1.13

Expand Down
4 changes: 2 additions & 2 deletions ccapi/handlers/invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/common"
)

func Invoke(c *gin.Context) {
Expand Down
4 changes: 2 additions & 2 deletions ccapi/handlers/invokeGateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/common"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions ccapi/handlers/invokeV1.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/common"
)

func InvokeV1(c *gin.Context) {
Expand Down
4 changes: 2 additions & 2 deletions ccapi/handlers/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/common"
)

func Query(c *gin.Context) {
Expand Down
4 changes: 2 additions & 2 deletions ccapi/handlers/queryGateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/common"
)

func QueryGatewayDefault(c *gin.Context) {
Expand Down
4 changes: 2 additions & 2 deletions ccapi/handlers/queryV1.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/common"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/common"
)

func QueryV1(c *gin.Context) {
Expand Down
4 changes: 2 additions & 2 deletions ccapi/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/chaincode"
"github.com/goledgerdev/ccapi/server"
"github.com/hyperledger-labs/ccapi/chaincode"
"github.com/hyperledger-labs/ccapi/server"
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
)

Expand Down
2 changes: 1 addition & 1 deletion ccapi/routes/chaincode.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package routes

import (
"github.com/goledgerdev/ccapi/handlers"
"github.com/hyperledger-labs/ccapi/handlers"

"github.com/gin-gonic/gin"
)
Expand Down
2 changes: 1 addition & 1 deletion ccapi/routes/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package routes

import (
"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/docs"
"github.com/hyperledger-labs/ccapi/docs"
swaggerfiles "github.com/swaggo/files"
ginSwagger "github.com/swaggo/gin-swagger"
)
Expand Down
4 changes: 2 additions & 2 deletions ccapi/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/goledgerdev/ccapi/common"
"github.com/goledgerdev/ccapi/routes"
"github.com/hyperledger-labs/ccapi/common"
"github.com/hyperledger-labs/ccapi/routes"
)

func defaultServer(r *gin.Engine) *http.Server {
Expand Down
4 changes: 2 additions & 2 deletions chaincode/assetTypeList.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/goledgerdev/cc-tools-demo/chaincode/assettypes"
"github.com/goledgerdev/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools-demo/chaincode/assettypes"
"github.com/hyperledger-labs/cc-tools/assets"
)

var assetTypeList = []assets.AssetType{
Expand Down
2 changes: 1 addition & 1 deletion chaincode/assettypes/book.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package assettypes

import "github.com/goledgerdev/cc-tools/assets"
import "github.com/hyperledger-labs/cc-tools/assets"

// Description of a book
var Book = assets.AssetType{
Expand Down
2 changes: 1 addition & 1 deletion chaincode/assettypes/customAssets.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package assettypes

import (
"github.com/goledgerdev/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/assets"
)

// CustomAssets contains all assets inserted via GoFabric's Template mode.
Expand Down
2 changes: 1 addition & 1 deletion chaincode/assettypes/dynamicAssetTypes.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package assettypes

import (
"github.com/goledgerdev/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/assets"
)

// DynamicAssetTypes contains the configuration for the Dynamic AssetTypes feature.
Expand Down
2 changes: 1 addition & 1 deletion chaincode/assettypes/library.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package assettypes

import "github.com/goledgerdev/cc-tools/assets"
import "github.com/hyperledger-labs/cc-tools/assets"

// Description of a Library as a collection of books
var Library = assets.AssetType{
Expand Down
2 changes: 1 addition & 1 deletion chaincode/assettypes/person.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package assettypes
import (
"fmt"

"github.com/goledgerdev/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/assets"
)

var Person = assets.AssetType{
Expand Down
2 changes: 1 addition & 1 deletion chaincode/assettypes/secret.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package assettypes

import "github.com/goledgerdev/cc-tools/assets"
import "github.com/hyperledger-labs/cc-tools/assets"

// Secret is and information available only for org2 and org3
// Collections.json configuration is necessary
Expand Down
4 changes: 2 additions & 2 deletions chaincode/datatypes/bookType.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strconv"

"github.com/goledgerdev/cc-tools/assets"
"github.com/goledgerdev/cc-tools/errors"
"github.com/hyperledger-labs/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/errors"
)

// Example of a custom data type using enum-like structure (iota)
Expand Down
4 changes: 2 additions & 2 deletions chaincode/datatypes/cpf.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datatypes
import (
"strings"

"github.com/goledgerdev/cc-tools/assets"
"github.com/goledgerdev/cc-tools/errors"
"github.com/hyperledger-labs/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/errors"
)

var cpf = assets.DataType{
Expand Down
2 changes: 1 addition & 1 deletion chaincode/datatypes/datatypes.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package datatypes

import (
"github.com/goledgerdev/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/assets"
)

// CustomDataTypes contain the user-defined primary data types
Expand Down
4 changes: 2 additions & 2 deletions chaincode/eventTypeList.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/goledgerdev/cc-tools-demo/chaincode/eventtypes"
"github.com/goledgerdev/cc-tools/events"
"github.com/hyperledger-labs/cc-tools-demo/chaincode/eventtypes"
"github.com/hyperledger-labs/cc-tools/events"
)

var eventTypeList = []events.Event{
Expand Down
2 changes: 1 addition & 1 deletion chaincode/eventtypes/createLibraryLog.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package eventtypes

import "github.com/goledgerdev/cc-tools/events"
import "github.com/hyperledger-labs/cc-tools/events"

// CreateLibraryLog is a log to be emitted on the CCAPI when a library is created
var CreateLibraryLog = events.Event{
Expand Down
6 changes: 3 additions & 3 deletions chaincode/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/goledgerdev/cc-tools-demo/chaincode
module github.com/hyperledger-labs/cc-tools-demo/chaincode

go 1.13

// replace github.com/goledgerdev/cc-tools => ../../cc-tools
// replace github.com/hyperledger-labs/cc-tools => ../../cc-tools

require (
github.com/cucumber/godog v0.12.5
github.com/goledgerdev/cc-tools v0.9.0
github.com/hyperledger-labs/cc-tools v0.0.0-20230925111202-1b51d7cd3cc5
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210603161043-af0e3898842a
github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31
github.com/mitchellh/mapstructure v1.3.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions chaincode/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/goledgerdev/cc-tools v0.9.0 h1:FAWSxo0ckD7R+IPd0nnKZ2qDHa/tN+S+r1FrR0Xg1XE=
github.com/goledgerdev/cc-tools v0.9.0/go.mod h1:QPqedLfWG2UQm4cYZ6CmX8ocxx9akPc/cRugyjoLr08=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
Expand Down Expand Up @@ -139,6 +137,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
github.com/hyperledger-labs/cc-tools v0.0.0-20230925111202-1b51d7cd3cc5 h1:Q7ZmNfYonwaPdlTutN+IN9jOBOT9byEjnKWqzJ3a7zY=
github.com/hyperledger-labs/cc-tools v0.0.0-20230925111202-1b51d7cd3cc5/go.mod h1:sR+BOyLX8mNk1CBbc7YTA6U0TxCe/urrT0TJyKF+8Uw=
github.com/hyperledger/fabric v2.1.1+incompatible h1:cYYRv3vVg4kA6DmrixLxwn1nwBEUuYda8DsMwlaMKbY=
github.com/hyperledger/fabric v2.1.1+incompatible/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210603161043-af0e3898842a h1:W3NE4+0cxLe/EK/VyhtLpR8kOBkkXCKDv8Ixy93YRjo=
Expand Down
14 changes: 7 additions & 7 deletions chaincode/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"strings"
"time"

"github.com/goledgerdev/cc-tools-demo/chaincode/assettypes"
"github.com/goledgerdev/cc-tools-demo/chaincode/datatypes"
"github.com/goledgerdev/cc-tools-demo/chaincode/header"
"github.com/goledgerdev/cc-tools/assets"
"github.com/goledgerdev/cc-tools/events"
sw "github.com/goledgerdev/cc-tools/stubwrapper"
tx "github.com/goledgerdev/cc-tools/transactions"
"github.com/hyperledger-labs/cc-tools-demo/chaincode/assettypes"
"github.com/hyperledger-labs/cc-tools-demo/chaincode/datatypes"
"github.com/hyperledger-labs/cc-tools-demo/chaincode/header"
"github.com/hyperledger-labs/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/events"
sw "github.com/hyperledger-labs/cc-tools/stubwrapper"
tx "github.com/hyperledger-labs/cc-tools/transactions"

"github.com/hyperledger/fabric-chaincode-go/shim"
pb "github.com/hyperledger/fabric-protos-go/peer"
Expand Down
2 changes: 1 addition & 1 deletion chaincode/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/goledgerdev/cc-tools/mock"
"github.com/hyperledger-labs/cc-tools/mock"
)

func TestMain(m *testing.M) {
Expand Down
4 changes: 2 additions & 2 deletions chaincode/txList.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
txdefs "github.com/goledgerdev/cc-tools-demo/chaincode/txdefs"
txdefs "github.com/hyperledger-labs/cc-tools-demo/chaincode/txdefs"

tx "github.com/goledgerdev/cc-tools/transactions"
tx "github.com/hyperledger-labs/cc-tools/transactions"
)

var txList = []tx.Transaction{
Expand Down
10 changes: 5 additions & 5 deletions chaincode/txdefs/createNewLibrary.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"encoding/json"
"fmt"

"github.com/goledgerdev/cc-tools/assets"
"github.com/goledgerdev/cc-tools/errors"
"github.com/goledgerdev/cc-tools/events"
sw "github.com/goledgerdev/cc-tools/stubwrapper"
tx "github.com/goledgerdev/cc-tools/transactions"
"github.com/hyperledger-labs/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/errors"
"github.com/hyperledger-labs/cc-tools/events"
sw "github.com/hyperledger-labs/cc-tools/stubwrapper"
tx "github.com/hyperledger-labs/cc-tools/transactions"
)

// Create a new Library on channel
Expand Down
8 changes: 4 additions & 4 deletions chaincode/txdefs/getBooksByAuthor.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package txdefs
import (
"encoding/json"

"github.com/goledgerdev/cc-tools/assets"
"github.com/goledgerdev/cc-tools/errors"
sw "github.com/goledgerdev/cc-tools/stubwrapper"
tx "github.com/goledgerdev/cc-tools/transactions"
"github.com/hyperledger-labs/cc-tools/assets"
"github.com/hyperledger-labs/cc-tools/errors"
sw "github.com/hyperledger-labs/cc-tools/stubwrapper"
tx "github.com/hyperledger-labs/cc-tools/transactions"
)

// Return the all books from an specific author
Expand Down
Loading