Skip to content

Commit 202dc80

Browse files
adecaroadecaro
committed
clean up dependencies of sdk.go
Signed-off-by: Angelo De Caro <[email protected]>
1 parent d6992ab commit 202dc80

File tree

48 files changed

+812
-555
lines changed

Some content is hidden

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

48 files changed

+812
-555
lines changed

‎integration/token/common/sdk/fall/sdk.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package fall
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/driver"
11+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/driver"
12+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
19+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
20+
_ "modernc.org/sqlite"
21+
)
22+
23+
type SDK struct {
24+
*sdk.SDK
25+
}
26+
27+
func NewSDK(registry sdk.Registry) *SDK {
28+
return &SDK{SDK: sdk.NewSDK(registry)}
29+
}

‎integration/token/common/sdk/fdlog/sdk.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package fdlog
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/driver"
11+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
12+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
19+
_ "modernc.org/sqlite"
20+
)
21+
22+
type SDK struct {
23+
*sdk.SDK
24+
}
25+
26+
func NewSDK(registry sdk.Registry) *SDK {
27+
return &SDK{SDK: sdk.NewSDK(registry)}
28+
}

‎integration/token/common/sdk/ffabtoken/sdk.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package ffabtoken
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/driver"
11+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
12+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
19+
_ "modernc.org/sqlite"
20+
)
21+
22+
type SDK struct {
23+
*sdk.SDK
24+
}
25+
26+
func NewSDK(registry sdk.Registry) *SDK {
27+
return &SDK{SDK: sdk.NewSDK(registry)}
28+
}

‎integration/token/common/sdk/fodlog/sdk.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package fodlog
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/driver"
11+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
12+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/orion"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
19+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
20+
_ "modernc.org/sqlite"
21+
)
22+
23+
type SDK struct {
24+
*sdk.SDK
25+
}
26+
27+
func NewSDK(registry sdk.Registry) *SDK {
28+
return &SDK{SDK: sdk.NewSDK(registry)}
29+
}

‎integration/token/common/sdk/fofabtoken/sdk.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package fofabtoken
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/driver"
11+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
12+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/orion"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
19+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
20+
_ "modernc.org/sqlite"
21+
)
22+
23+
type SDK struct {
24+
*sdk.SDK
25+
}
26+
27+
func NewSDK(registry sdk.Registry) *SDK {
28+
return &SDK{SDK: sdk.NewSDK(registry)}
29+
}

‎integration/token/common/sdk/odlog/sdk.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package odlog
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/driver"
11+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
12+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/orion"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
19+
_ "modernc.org/sqlite"
20+
)
21+
22+
type SDK struct {
23+
*sdk.SDK
24+
}
25+
26+
func NewSDK(registry sdk.Registry) *SDK {
27+
return &SDK{SDK: sdk.NewSDK(registry)}
28+
}

‎integration/token/common/sdk/ofabtoken/sdk.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package ofabtoken
8+
9+
import (
10+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/driver"
11+
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
12+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
13+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
14+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver"
15+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
16+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/orion"
17+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
18+
_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
19+
_ "modernc.org/sqlite"
20+
)
21+
22+
type SDK struct {
23+
*sdk.SDK
24+
}
25+
26+
func NewSDK(registry sdk.Registry) *SDK {
27+
return &SDK{SDK: sdk.NewSDK(registry)}
28+
}

‎integration/token/common/topology.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,23 @@ SPDX-License-Identifier: Apache-2.0
77
package common
88

99
import (
10+
"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
1011
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/dlog"
1112
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
1213
. "github.com/onsi/gomega"
1314
)
1415

16+
type Opts struct {
17+
Backend string
18+
TokenSDKDriver string
19+
AuditorAsIssuer bool
20+
Aries bool
21+
FSCLogSpec string
22+
NoAuditor bool
23+
HSM bool
24+
SDKs []api.SDK
25+
}
26+
1527
func SetDefaultParams(tokenSDKDriver string, tms *topology.TMS, aries bool) {
1628
switch tokenSDKDriver {
1729
case "dlog":

‎integration/token/dvp/dlog/dlog_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/hyperledger-labs/fabric-smart-client/integration"
1111
fabric3 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1212
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
13+
"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common/sdk/fdlog"
1314
dvp2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/dvp"
14-
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
1515
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
)
@@ -28,7 +28,7 @@ var _ = Describe("EndToEnd", func() {
2828
Describe("ZKAT-DLog DVP", func() {
2929
BeforeEach(func() {
3030
var err error
31-
ii, err = integration.New(StartPort(), "", dvp2.Topology("dlog", &fabric3.SDK{}, &sdk.SDK{})...)
31+
ii, err = integration.New(StartPort(), "", dvp2.Topology("dlog", &fabric3.SDK{}, &fdlog.SDK{})...)
3232
Expect(err).NotTo(HaveOccurred())
3333
ii.RegisterPlatformFactory(token.NewPlatformFactory())
3434
ii.Generate()

‎integration/token/dvp/fabtoken/fabtoken_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/hyperledger-labs/fabric-smart-client/integration"
1111
fabric3 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
1212
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
13+
"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common/sdk/ffabtoken"
1314
dvp2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/dvp"
14-
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
1515
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
)
@@ -28,7 +28,7 @@ var _ = Describe("EndToEnd", func() {
2828
Describe("Plain DVP", func() {
2929
BeforeEach(func() {
3030
var err error
31-
ii, err = integration.New(StartPort(), "", dvp2.Topology("fabtoken", &fabric3.SDK{}, &sdk.SDK{})...)
31+
ii, err = integration.New(StartPort(), "", dvp2.Topology("fabtoken", &fabric3.SDK{}, &ffabtoken.SDK{})...)
3232
Expect(err).NotTo(HaveOccurred())
3333
ii.RegisterPlatformFactory(token.NewPlatformFactory())
3434
ii.Generate()

‎integration/token/fungible/dlog/dlog_test.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ package dlog
99
import (
1010
"os"
1111

12+
"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common"
13+
14+
"github.com/hyperledger-labs/fabric-token-sdk/integration/token/common/sdk/fdlog"
15+
1216
"github.com/hyperledger-labs/fabric-smart-client/integration"
1317
"github.com/hyperledger-labs/fabric-smart-client/pkg/api"
1418
fabric "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/sdk"
@@ -18,7 +22,6 @@ import (
1822
"github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible"
1923
topology2 "github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/topology"
2024
"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/crypto"
21-
sdk "github.com/hyperledger-labs/fabric-token-sdk/token/sdk"
2225
. "github.com/onsi/ginkgo/v2"
2326
. "github.com/onsi/gomega"
2427
_ "modernc.org/sqlite"
@@ -39,12 +42,12 @@ var _ = Describe("EndToEnd", func() {
3942
// notice that fabric-ca does not support yet aries
4043
var err error
4144
network, err = integration.New(StartPortDlog(), "", topology2.Topology(
42-
topology2.Opts{
45+
common.Opts{
4346
Backend: "fabric",
4447
TokenSDKDriver: "dlog",
4548
Aries: true,
4649
//FSCLogSpec: "token-sdk=debug:fabric-sdk=debug:info",
47-
SDKs: []api.SDK{&fabric.SDK{}, &sdk.SDK{}},
50+
SDKs: []api.SDK{&fabric.SDK{}, &fdlog.SDK{}},
4851
},
4952
)...)
5053
Expect(err).NotTo(HaveOccurred())
@@ -64,11 +67,11 @@ var _ = Describe("EndToEnd", func() {
6467
// notice that fabric-ca does not support yet aries
6568
var err error
6669
network, err = integration.New(StartPortDlog(), "", topology2.Topology(
67-
topology2.Opts{
70+
common.Opts{
6871
Backend: "fabric",
6972
TokenSDKDriver: "dlog",
7073
Aries: true,
71-
SDKs: []api.SDK{&fabric.SDK{}, &sdk.SDK{}},
74+
SDKs: []api.SDK{&fabric.SDK{}, &fdlog.SDK{}},
7275
},
7376
)...)
7477
Expect(err).NotTo(HaveOccurred())
@@ -101,12 +104,12 @@ var _ = Describe("EndToEnd", func() {
101104
BeforeEach(func() {
102105
var err error
103106
network, err = integration.New(StartPortDlog(), "", topology2.Topology(
104-
topology2.Opts{
107+
common.Opts{
105108
Backend: "fabric",
106109
TokenSDKDriver: "dlog",
107110
AuditorAsIssuer: true,
108111
Aries: true,
109-
SDKs: []api.SDK{&fabric.SDK{}, &sdk.SDK{}},
112+
SDKs: []api.SDK{&fabric.SDK{}, &fdlog.SDK{}},
110113
//FSCLogSpec: "token-sdk=debug:fabric-sdk=debug:info",
111114
},
112115
)...)
@@ -132,10 +135,10 @@ var _ = Describe("EndToEnd", func() {
132135
BeforeEach(func() {
133136
var err error
134137
network, err = integration.New(StartPortDlog(), "", topology2.Topology(
135-
topology2.Opts{
138+
common.Opts{
136139
Backend: "fabric",
137140
TokenSDKDriver: "dlog",
138-
SDKs: []api.SDK{&fabric.SDK{}, &sdk.SDK{}},
141+
SDKs: []api.SDK{&fabric.SDK{}, &fdlog.SDK{}},
139142
},
140143
)...)
141144
Expect(err).NotTo(HaveOccurred())
@@ -154,12 +157,12 @@ var _ = Describe("EndToEnd", func() {
154157
// notice that fabric-ca does not support yet aries
155158
var err error
156159
network, err = integration.New(StartPortDlog(), "", topology2.Topology(
157-
topology2.Opts{
160+
common.Opts{
158161
Backend: "fabric",
159162
TokenSDKDriver: "dlog",
160163
Aries: true,
161164
NoAuditor: true,
162-
SDKs: []api.SDK{&fabric.SDK{}, &sdk.SDK{}},
165+
SDKs: []api.SDK{&fabric.SDK{}, &fdlog.SDK{}},
163166
//FSCLogSpec: "token-sdk=debug:fabric-sdk=debug:info",
164167
})...)
165168
Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)