Skip to content

Commit 12eef60

Browse files
alexandrosfiliosalexandrosfilios
committed
DB implementation for binding store
Signed-off-by: Alexandros Filios <[email protected]>
1 parent 0effc7f commit 12eef60

File tree

46 files changed

+626
-366
lines changed

Some content is hidden

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

46 files changed

+626
-366
lines changed

‎docs/fabric/fabricdev/core/fabricdev/channelprovider.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
)
3131

3232
type provider struct {
33-
envelopeKVS driver.EnvelopeKVS
34-
metadataKVS driver.MetadataKVS
35-
endorseTxKVS driver.EndorseTxKVS
33+
envelopeKVS driver.EnvelopeStore
34+
metadataKVS driver.MetadataStore
35+
endorseTxKVS driver.EndorseTxStore
3636
publisher events.Publisher
3737
hasher hash.Hasher
3838
newVault generic.VaultConstructor
@@ -46,9 +46,9 @@ type provider struct {
4646
}
4747

4848
func NewChannelProvider(
49-
envelopeKVS driver.EnvelopeKVS,
50-
metadataKVS driver.MetadataKVS,
51-
endorseTxKVS driver.EndorseTxKVS,
49+
envelopeKVS driver.EnvelopeStore,
50+
metadataKVS driver.MetadataStore,
51+
endorseTxKVS driver.EndorseTxStore,
5252
publisher events.Publisher,
5353
hasher hash.Hasher,
5454
tracerProvider trace.TracerProvider,

‎docs/fabric/fabricdev/core/fabricdev/driver/provider.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ type Provider struct {
5050
}
5151

5252
func NewProvider(
53-
envelopeKVS fdriver.EnvelopeKVS,
54-
metadataKVS fdriver.MetadataKVS,
55-
endorseTxKVS fdriver.EndorseTxKVS,
53+
envelopeKVS fdriver.EnvelopeStore,
54+
metadataKVS fdriver.MetadataStore,
55+
endorseTxKVS fdriver.EndorseTxStore,
5656
configProvider config.Provider,
5757
metricsProvider metrics.Provider,
5858
endpointService identity.EndpointService,

‎docs/fabric/fabricdev/sdk/fabricdev/providers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
func NewDriver(in struct {
2727
dig.In
2828

29-
EnvelopeKVS driver.EnvelopeKVS
30-
MetadataKVS driver.MetadataKVS
31-
EndorseTxKVS driver.EndorseTxKVS
29+
EnvelopeKVS driver.EnvelopeStore
30+
MetadataKVS driver.MetadataStore
31+
EndorseTxKVS driver.EndorseTxStore
3232
ConfigProvider config.Provider
3333
MetricsProvider metrics.Provider
3434
EndpointService vdriver.EndpointService

‎platform/common/driver/kvs.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,36 @@ type SignerEntry struct {
1515
DebugStack []byte
1616
}
1717

18-
type SignerKVS interface {
18+
type SignerStore interface {
1919
GetSigner(id view.Identity) (*SignerEntry, error)
2020
FilterExistingSigners(ids ...view.Identity) ([]view.Identity, error)
2121
PutSigner(id view.Identity, entry *SignerEntry) error
2222
}
2323

24-
type AuditInfoKVS interface {
24+
type AuditInfoStore interface {
2525
GetAuditInfo(id view.Identity) ([]byte, error)
2626
PutAuditInfo(id view.Identity, info []byte) error
2727
}
2828

29-
type BindingKVS interface {
30-
GetBinding(ephemeral view.Identity) (view.Identity, error)
29+
type BindingStore interface {
30+
GetLongTerm(ephemeral view.Identity) (view.Identity, error)
3131
HaveSameBinding(this, that view.Identity) (bool, error)
3232
PutBinding(ephemeral, longTerm view.Identity) error
3333
}
3434

35-
type MetadataKVS[K any, M any] interface {
35+
type MetadataStore[K any, M any] interface {
3636
GetMetadata(key K) (M, error)
3737
ExistMetadata(key K) (bool, error)
3838
PutMetadata(key K, transientMap M) error
3939
}
4040

41-
type EnvelopeKVS[K any] interface {
41+
type EnvelopeStore[K any] interface {
4242
GetEnvelope(key K) ([]byte, error)
4343
ExistsEnvelope(key K) (bool, error)
4444
PutEnvelope(key K, env []byte) error
4545
}
4646

47-
type EndorseTxKVS[K any] interface {
47+
type EndorseTxStore[K any] interface {
4848
GetEndorseTx(key K) ([]byte, error)
4949
ExistsEndorseTx(key K) (bool, error)
5050
PutEndorseTx(key K, etx []byte) error

‎platform/common/services/sig/service.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ type SignerEntry = driver2.SignerEntry
3232

3333
type Service struct {
3434
deserializer Deserializer
35-
signerKVS driver2.SignerKVS
36-
auditInfoKVS driver2.AuditInfoKVS
35+
signerKVS driver2.SignerStore
36+
auditInfoKVS driver2.AuditInfoStore
3737

3838
mutex sync.RWMutex
3939
signers map[string]SignerEntry
4040
verifiers map[string]VerifierEntry
4141
}
4242

43-
func NewService(deserializer Deserializer, auditInfoKVS driver2.AuditInfoKVS, signerKVS driver2.SignerKVS) *Service {
43+
func NewService(deserializer Deserializer, auditInfoKVS driver2.AuditInfoStore, signerKVS driver2.SignerStore) *Service {
4444
return &Service{
4545
signerKVS: signerKVS,
4646
auditInfoKVS: auditInfoKVS,

‎platform/fabric/core/generic/channelprovider.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ type ChannelProvider interface {
6868
}
6969

7070
type provider struct {
71-
envelopeKVS driver.EnvelopeKVS
72-
metadataKVS driver.MetadataKVS
73-
endorserTxKVS driver.EndorseTxKVS
71+
envelopeKVS driver.EnvelopeStore
72+
metadataKVS driver.MetadataStore
73+
endorserTxKVS driver.EndorseTxStore
7474
publisher events.Publisher
7575
hasher hash.Hasher
7676
newVault VaultConstructor
@@ -88,9 +88,9 @@ type provider struct {
8888
}
8989

9090
func NewChannelProvider(
91-
envelopeKVS driver.EnvelopeKVS,
92-
metadataKVS driver.MetadataKVS,
93-
endorserTxKVS driver.EndorseTxKVS,
91+
envelopeKVS driver.EnvelopeStore,
92+
metadataKVS driver.MetadataStore,
93+
endorserTxKVS driver.EndorseTxStore,
9494
publisher events.Publisher,
9595
hasher hash.Hasher,
9696
tracerProvider trace.TracerProvider,

‎platform/fabric/core/generic/driver/provider.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func NewProvider(
4040
channelProvider generic.ChannelProvider,
4141
idProvider vdriver.IdentityProvider,
4242
identityLoaders []identity.NamedIdentityLoader,
43-
signerKVS driver.SignerKVS,
44-
auditInfoKVS driver.AuditInfoKVS,
43+
signerKVS driver.SignerStore,
44+
auditInfoKVS driver.AuditInfoStore,
4545
kvss *kvs.KVS,
4646
) *Provider {
4747
deserializerManager := sig.NewMultiplexDeserializer()

‎platform/fabric/core/generic/id/info_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import (
1717
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
1818
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs/mock"
1919
registry2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/registry"
20+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/auditinfo"
21+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/signerinfo"
2022
msp2 "github.com/hyperledger/fabric/msp"
2123
"github.com/stretchr/testify/assert"
2224
)
@@ -27,7 +29,7 @@ func TestInfoIdemix(t *testing.T) {
2729
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
2830
assert.NoError(t, err)
2931
assert.NoError(t, registry.RegisterService(kvss))
30-
sigService := sig.NewService(sig.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
32+
sigService := sig.NewService(sig.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
3133
assert.NoError(t, registry.RegisterService(sigService))
3234

3335
config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")

‎platform/fabric/core/generic/msp/idemix/provider_test.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import (
1919
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
2020
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs/mock"
2121
registry2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/registry"
22+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/auditinfo"
23+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/signerinfo"
2224
msp2 "github.com/hyperledger/fabric/msp"
2325
"github.com/stretchr/testify/assert"
2426
)
@@ -29,7 +31,7 @@ func TestProvider(t *testing.T) {
2931
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
3032
assert.NoError(t, err)
3133
assert.NoError(t, registry.RegisterService(kvss))
32-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
34+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
3335
assert.NoError(t, registry.RegisterService(sigService))
3436

3537
config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
@@ -54,7 +56,7 @@ func TestIdentityWithEidRhNymPolicy(t *testing.T) {
5456
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
5557
assert.NoError(t, err)
5658
assert.NoError(t, registry.RegisterService(kvss))
57-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
59+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
5860
assert.NoError(t, registry.RegisterService(sigService))
5961

6062
config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
@@ -119,7 +121,7 @@ func TestIdentityStandard(t *testing.T) {
119121
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
120122
assert.NoError(t, err)
121123
assert.NoError(t, registry.RegisterService(kvss))
122-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
124+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
123125
assert.NoError(t, registry.RegisterService(sigService))
124126

125127
config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
@@ -186,7 +188,7 @@ func TestAuditWithEidRhNymPolicy(t *testing.T) {
186188
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
187189
assert.NoError(t, err)
188190
assert.NoError(t, registry.RegisterService(kvss))
189-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
191+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
190192
assert.NoError(t, registry.RegisterService(sigService))
191193

192194
config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
@@ -228,7 +230,7 @@ func TestProvider_DeserializeSigner(t *testing.T) {
228230
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
229231
assert.NoError(t, err)
230232
assert.NoError(t, registry.RegisterService(kvss))
231-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
233+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
232234
assert.NoError(t, registry.RegisterService(sigService))
233235

234236
config, err := msp2.GetLocalMspConfigWithType("./testdata/sameissuer/idemix", nil, "idemix", "idemix")
@@ -284,7 +286,7 @@ func TestIdentityFromFabricCA(t *testing.T) {
284286
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
285287
assert.NoError(t, err)
286288
assert.NoError(t, registry.RegisterService(kvss))
287-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
289+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
288290
assert.NoError(t, registry.RegisterService(sigService))
289291

290292
config, err := idemix2.GetLocalMspConfigWithType("./testdata/charlie.ExtraId2", "charlie.ExtraId2")
@@ -351,7 +353,7 @@ func TestIdentityFromFabricCAWithEidRhNymPolicy(t *testing.T) {
351353
kvss, err := kvs.NewWithConfig(&mem.Driver{}, "", &mock.ConfigProvider{})
352354
assert.NoError(t, err)
353355
assert.NoError(t, registry.RegisterService(kvss))
354-
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
356+
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
355357
assert.NoError(t, registry.RegisterService(sigService))
356358

357359
config, err := idemix2.GetLocalMspConfigWithType("./testdata/charlie.ExtraId2", "charlie.ExtraId2")

‎platform/fabric/core/generic/msp/service_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/memory"
2121
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
2222
registry2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/registry"
23+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/auditinfo"
24+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/signerinfo"
2325
"github.com/otiai10/copy"
2426
"github.com/stretchr/testify/assert"
2527
)
@@ -41,7 +43,7 @@ func TestRegisterIdemixLocalMSP(t *testing.T) {
4143
assert.NoError(t, err)
4244
mspService := msp2.NewLocalMSPManager(config, kvss, nil, nil, nil, des, 100)
4345
assert.NoError(t, registry.RegisterService(mspService))
44-
sigService := sig.NewService(des, kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
46+
sigService := sig.NewService(des, auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
4547
assert.NoError(t, registry.RegisterService(sigService))
4648

4749
assert.NoError(t, mspService.RegisterIdemixMSP("apple", "./idemix/testdata/idemix", "idemix"))
@@ -73,7 +75,7 @@ func TestIdemixTypeFolder(t *testing.T) {
7375
assert.NoError(t, err)
7476
mspService := msp2.NewLocalMSPManager(config, kvss, nil, nil, nil, des, 100)
7577
assert.NoError(t, registry.RegisterService(mspService))
76-
sigService := sig.NewService(des, kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
78+
sigService := sig.NewService(des, auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
7779
assert.NoError(t, registry.RegisterService(sigService))
7880

7981
assert.NoError(t, mspService.Load())
@@ -101,7 +103,7 @@ func TestRegisterX509LocalMSP(t *testing.T) {
101103
assert.NoError(t, err)
102104
mspService := msp2.NewLocalMSPManager(config, kvss, nil, nil, nil, des, 100)
103105
assert.NoError(t, registry.RegisterService(mspService))
104-
sigService := sig.NewService(des, kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
106+
sigService := sig.NewService(des, auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
105107
assert.NoError(t, registry.RegisterService(sigService))
106108

107109
assert.NoError(t, mspService.RegisterX509MSP("apple", "./x509/testdata/msp", "x509"))
@@ -132,7 +134,7 @@ func TestX509TypeFolder(t *testing.T) {
132134
assert.NoError(t, err)
133135
mspService := msp2.NewLocalMSPManager(config, kvss, nil, nil, nil, des, 100)
134136
assert.NoError(t, registry.RegisterService(mspService))
135-
sigService := sig.NewService(des, kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
137+
sigService := sig.NewService(des, auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
136138
assert.NoError(t, registry.RegisterService(sigService))
137139

138140
assert.NoError(t, mspService.Load())
@@ -160,7 +162,7 @@ func TestRefresh(t *testing.T) {
160162
assert.NoError(t, err)
161163
mspService := msp2.NewLocalMSPManager(config, kvss, nil, nil, nil, des, 100)
162164
assert.NoError(t, registry.RegisterService(mspService))
163-
sigService := sig.NewService(des, kvs.NewAuditInfoKVS(kvss), kvs.NewSignerKVS(kvss))
165+
sigService := sig.NewService(des, auditinfo.NewKVSBased(kvss), signerinfo.NewKVSBased(kvss))
164166
assert.NoError(t, registry.RegisterService(sigService))
165167

166168
assert.NoError(t, mspService.Load())

0 commit comments

Comments
 (0)