Skip to content

Commit 240c3e2

Browse files
alexandrosfiliosalexandrosfilios
committed
fixup! Included new stores in config for integration tests
Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>
1 parent 62ca04b commit 240c3e2

File tree

11 files changed

+51
-41
lines changed

11 files changed

+51
-41
lines changed

‎platform/fabric/sdk/dig/generic/providers.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
1111
committer2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/core/generic/committer"
1212
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
13-
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1413
digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
1514
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core"
1615
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic"
@@ -28,7 +27,6 @@ import (
2827
vdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
2928
sdk "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/dig"
3029
dbdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
31-
mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/memory"
3230
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/events"
3331
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
3432
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
@@ -187,8 +185,8 @@ func NewEndorseTxStore(in struct {
187185
Config vdriver.ConfigService
188186
Drivers []dbdriver.NamedDriver `group:"db-drivers"`
189187
}) (driver.EndorseTxStore, error) {
190-
driverName := driver2.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.endorsetx.persistence.type"), string(mem.MemoryPersistence)))
191-
if sdk.UnsupportedStores.Contains(driverName) {
188+
driverName := driver2.PersistenceType(in.Config.GetString("fsc.endorsetx.persistence.type"))
189+
if !sdk.SupportedStores.Contains(driverName) {
192190
return services.NewKVSBasedEndorseTxStore(in.KVS), nil
193191
}
194192
for _, d := range in.Drivers {
@@ -205,8 +203,8 @@ func NewMetadataStore(in struct {
205203
Config vdriver.ConfigService
206204
Drivers []dbdriver.NamedDriver `group:"db-drivers"`
207205
}) (driver.MetadataStore, error) {
208-
driverName := driver2.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.metadata.persistence.type"), string(mem.MemoryPersistence)))
209-
if sdk.UnsupportedStores.Contains(driverName) {
206+
driverName := driver2.PersistenceType(in.Config.GetString("fsc.metadata.persistence.type"))
207+
if !sdk.SupportedStores.Contains(driverName) {
210208
return services.NewKVSBasedMetadataStore(in.KVS), nil
211209
}
212210
for _, d := range in.Drivers {
@@ -223,8 +221,8 @@ func NewEnvelopeStore(in struct {
223221
Config vdriver.ConfigService
224222
Drivers []dbdriver.NamedDriver `group:"db-drivers"`
225223
}) (driver.EnvelopeStore, error) {
226-
driverName := driver2.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.envelope.persistence.type"), string(mem.MemoryPersistence)))
227-
if sdk.UnsupportedStores.Contains(driverName) {
224+
driverName := driver2.PersistenceType(in.Config.GetString("fsc.envelope.persistence.type"))
225+
if !sdk.SupportedStores.Contains(driverName) {
228226
return services.NewKVSBasedEnvelopeStore(in.KVS), nil
229227
}
230228
for _, d := range in.Drivers {

‎platform/orion/sdk/dig/providers.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ package orion
88

99
import (
1010
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
11-
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1211
driver3 "github.com/hyperledger-labs/fabric-smart-client/platform/orion/driver"
1312
"github.com/hyperledger-labs/fabric-smart-client/platform/orion/services"
1413
"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
1514
sdk "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/dig"
1615
dbdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
17-
mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/memory"
1816
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
1917
"github.com/pkg/errors"
2018
"go.uber.org/dig"
@@ -26,8 +24,8 @@ func NewEndorseTxStore(in struct {
2624
Config driver.ConfigService
2725
Drivers []dbdriver.NamedDriver `group:"db-drivers"`
2826
}) (driver3.EndorseTxStore, error) {
29-
driverName := driver2.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.endorsetx.persistence.type"), string(mem.MemoryPersistence)))
30-
if sdk.UnsupportedStores.Contains(driverName) {
27+
driverName := driver2.PersistenceType(in.Config.GetString("fsc.endorsetx.persistence.type"))
28+
if !sdk.SupportedStores.Contains(driverName) {
3129
return services.NewKVSBasedEndorseTxStore(in.KVS), nil
3230
}
3331
for _, d := range in.Drivers {
@@ -44,8 +42,8 @@ func NewMetadataStore(in struct {
4442
Config driver.ConfigService
4543
Drivers []dbdriver.NamedDriver `group:"db-drivers"`
4644
}) (driver3.MetadataStore, error) {
47-
driverName := driver2.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.metadata.persistence.type"), string(mem.MemoryPersistence)))
48-
if sdk.UnsupportedStores.Contains(driverName) {
45+
driverName := driver2.PersistenceType(in.Config.GetString("fsc.metadata.persistence.type"))
46+
if !sdk.SupportedStores.Contains(driverName) {
4947
return services.NewKVSBasedMetadataStore(in.KVS), nil
5048
}
5149
for _, d := range in.Drivers {
@@ -62,8 +60,8 @@ func NewEnvelopeStore(in struct {
6260
Config driver.ConfigService
6361
Drivers []dbdriver.NamedDriver `group:"db-drivers"`
6462
}) (driver3.EnvelopeStore, error) {
65-
driverName := driver2.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.envelope.persistence.type"), string(mem.MemoryPersistence)))
66-
if sdk.UnsupportedStores.Contains(driverName) {
63+
driverName := driver2.PersistenceType(in.Config.GetString("fsc.envelope.persistence.type"))
64+
if !sdk.SupportedStores.Contains(driverName) {
6765
return services.NewKVSBasedEnvelopeStore(in.KVS), nil
6866
}
6967
for _, d := range in.Drivers {

‎platform/view/sdk/dig/providers.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
1313
"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
1414
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
15-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/badger"
1615
mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/memory"
16+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql"
1717
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms"
1818
driver3 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms/driver"
1919
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
@@ -38,16 +38,16 @@ func newKVS(in struct {
3838
return nil, errors.New("driver not found")
3939
}
4040

41-
var UnsupportedStores = collections.NewSet(badger.FilePersistence, badger.BadgerPersistence)
41+
var SupportedStores = collections.NewSet(mem.MemoryPersistence, sql.SQLPersistence)
4242

4343
func newBindingStore(in struct {
4444
dig.In
4545
KVS *kvs.KVS
4646
Config driver.ConfigService
4747
Drivers []driver2.NamedDriver `group:"db-drivers"`
4848
}) (driver4.BindingStore, error) {
49-
driverName := driver4.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.binding.persistence.type"), string(mem.MemoryPersistence)))
50-
if UnsupportedStores.Contains(driverName) {
49+
driverName := driver4.PersistenceType(in.Config.GetString("fsc.binding.persistence.type"))
50+
if !SupportedStores.Contains(driverName) {
5151
return binding.NewKVSBased(in.KVS), nil
5252
}
5353
for _, d := range in.Drivers {
@@ -64,8 +64,8 @@ func newSignerInfoStore(in struct {
6464
Config driver.ConfigService
6565
Drivers []driver2.NamedDriver `group:"db-drivers"`
6666
}) (driver4.SignerInfoStore, error) {
67-
driverName := driver4.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.signerinfo.persistence.type"), string(mem.MemoryPersistence)))
68-
if UnsupportedStores.Contains(driverName) {
67+
driverName := driver4.PersistenceType(in.Config.GetString("fsc.signerinfo.persistence.type"))
68+
if !SupportedStores.Contains(driverName) {
6969
return signerinfo.NewKVSBased(in.KVS), nil
7070
}
7171
for _, d := range in.Drivers {
@@ -82,8 +82,8 @@ func newAuditInfoStore(in struct {
8282
Config driver.ConfigService
8383
Drivers []driver2.NamedDriver `group:"db-drivers"`
8484
}) (driver4.AuditInfoStore, error) {
85-
driverName := driver4.PersistenceType(utils.DefaultString(in.Config.GetString("fsc.auditinfo.persistence.type"), string(mem.MemoryPersistence)))
86-
if UnsupportedStores.Contains(driverName) {
85+
driverName := driver4.PersistenceType(in.Config.GetString("fsc.auditinfo.persistence.type"))
86+
if !SupportedStores.Contains(driverName) {
8787
return auditinfo.NewKVSBased(in.KVS), nil
8888
}
8989
for _, d := range in.Drivers {

‎platform/view/services/db/driver/sql/common/signerinfo.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (db *SignerInfoPersistence) FilterExistingSigners(ids ...view.Identity) ([]
4343
}
4444
where, params := Where(db.ci.InStrings("id", idHashes))
4545
query := fmt.Sprintf("SELECT id FROM %s %s", db.table, where)
46-
logger.Debug(query, params)
46+
logger.Info(query, params)
4747

4848
rows, err := db.readDB.Query(query, params...)
4949
if err != nil {
@@ -58,13 +58,13 @@ func (db *SignerInfoPersistence) FilterExistingSigners(ids ...view.Identity) ([]
5858
}
5959
existingSigners = append(existingSigners, inverseMap[idHash])
6060
}
61-
logger.Debugf("Found %d out of %d signers", len(existingSigners), len(ids))
61+
logger.Infof("Found %d out of %d signers", len(existingSigners), len(ids))
6262
return existingSigners, nil
6363
}
6464

6565
func (db *SignerInfoPersistence) PutSigner(id view.Identity) error {
6666
query := fmt.Sprintf("INSERT INTO %s (id) VALUES ($1)", db.table)
67-
logger.Debugf(query, id)
67+
logger.Info(query, id)
6868
_, err := db.writeDB.Exec(query, id.UniqueID())
6969
if err != nil && errors.Is(db.errorWrapper.WrapError(err), driver.UniqueKeyViolation) {
7070
logger.Warnf("Signer [%s] already in db. Skipping...", id)
@@ -73,7 +73,7 @@ func (db *SignerInfoPersistence) PutSigner(id view.Identity) error {
7373
if err != nil {
7474
return errors.Wrapf(err, "failed executing query [%s]", query)
7575
}
76-
logger.Debugf("Signer [%s] registered", id)
76+
logger.Infof("Signer [%s] registered", id)
7777
return nil
7878
}
7979

‎platform/view/services/storage/auditinfo/standalone.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package auditinfo
88

99
import (
10+
"fmt"
11+
1012
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
1113
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
1214
)
@@ -16,5 +18,5 @@ const (
1618
)
1719

1820
func NewWithConfig(dbDriver driver.Driver, namespace string, cp db.Config) (driver.AuditInfoPersistence, error) {
19-
return dbDriver.NewAuditInfo(namespace, db.NewPrefixConfig(cp, persistenceOptsConfigKey))
21+
return dbDriver.NewAuditInfo(fmt.Sprintf("%s_audit", namespace), db.NewPrefixConfig(cp, persistenceOptsConfigKey))
2022
}

‎platform/view/services/storage/binding/kvsbased.go‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package binding
88

99
import (
10+
errors2 "errors"
11+
1012
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
1113
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1214
"github.com/pkg/errors"
@@ -34,23 +36,24 @@ func (kvs *kvsBased) HaveSameBinding(this, that view.Identity) (bool, error) {
3436
func (kvs *kvsBased) GetLongTerm(ephemeral view.Identity) (view.Identity, error) {
3537
return kvs.e.Get(ephemeral)
3638
}
39+
3740
func (kvs *kvsBased) PutBinding(ephemeral, longTerm view.Identity) error {
3841
if ephemeral.IsNone() || longTerm.IsNone() {
3942
return errors.New("empty ids passed")
4043
}
4144
// Make sure the long term is passed, so that the hierarchy is flat and all ephemerals point to the long term
42-
longTerm, err := kvs.e.Get(longTerm)
45+
lt, err := kvs.e.Get(longTerm)
4346
if err != nil {
4447
return errors.Wrapf(err, "no long term found for [%s]. if long term was passed, it has to be registered first.", longTerm)
4548
}
46-
if longTerm != nil {
47-
return kvs.e.Put(ephemeral, longTerm)
49+
if lt != nil {
50+
return kvs.e.Put(ephemeral, lt)
4851
}
4952

50-
if err := kvs.e.Put(longTerm, longTerm); err != nil {
51-
return errors.Wrapf(err, "failed to register [%s] as long term", longTerm)
52-
}
53-
return kvs.e.Put(ephemeral, longTerm)
53+
return errors2.Join(
54+
kvs.e.Put(longTerm, longTerm),
55+
kvs.e.Put(ephemeral, longTerm),
56+
)
5457
}
5558

5659
func bindingKey(ephemeral view.Identity) (string, error) {

‎platform/view/services/storage/binding/standalone.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package binding
88

99
import (
10+
"fmt"
11+
1012
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
1113
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
1214
)
@@ -16,5 +18,5 @@ const (
1618
)
1719

1820
func NewWithConfig(dbDriver driver.Driver, namespace string, cp db.Config) (driver.BindingPersistence, error) {
19-
return dbDriver.NewBinding(namespace, db.NewPrefixConfig(cp, persistenceOptsConfigKey))
21+
return dbDriver.NewBinding(fmt.Sprintf("%s_bind", namespace), db.NewPrefixConfig(cp, persistenceOptsConfigKey))
2022
}

‎platform/view/services/storage/endorsetx/standalone.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package endorsetx
88

99
import (
10+
"fmt"
11+
1012
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
1113
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
1214
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
@@ -21,7 +23,7 @@ type identifier interface {
2123
}
2224

2325
func NewWithConfig[K identifier](dbDriver driver.Driver, namespace string, cp db.Config) (driver2.EndorseTxStore[K], error) {
24-
e, err := dbDriver.NewEndorseTx(namespace, db.NewPrefixConfig(cp, persistenceOptsConfigKey))
26+
e, err := dbDriver.NewEndorseTx(fmt.Sprintf("%s_etx", namespace), db.NewPrefixConfig(cp, persistenceOptsConfigKey))
2527
if err != nil {
2628
return nil, err
2729
}

‎platform/view/services/storage/envelope/standalone.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package envelope
88

99
import (
10+
"fmt"
11+
1012
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
1113
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
1214
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
@@ -21,7 +23,7 @@ type identifier interface {
2123
}
2224

2325
func NewWithConfig[K identifier](dbDriver driver.Driver, namespace string, cp db.Config) (driver2.EnvelopeStore[K], error) {
24-
e, err := dbDriver.NewEnvelope(namespace, db.NewPrefixConfig(cp, persistenceOptsConfigKey))
26+
e, err := dbDriver.NewEnvelope(fmt.Sprintf("%s_env", namespace), db.NewPrefixConfig(cp, persistenceOptsConfigKey))
2527
if err != nil {
2628
return nil, err
2729
}

‎platform/view/services/storage/metadata/standalone.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package metadata
88

99
import (
1010
"encoding/json"
11+
"fmt"
1112

1213
driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
1314
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
@@ -23,7 +24,7 @@ type identifier interface {
2324
}
2425

2526
func NewWithConfig[K identifier, M any](dbDriver driver.Driver, namespace string, cp db.Config) (driver2.MetadataStore[K, M], error) {
26-
m, err := dbDriver.NewMetadata(namespace, db.NewPrefixConfig(cp, persistenceOptsConfigKey))
27+
m, err := dbDriver.NewMetadata(fmt.Sprintf("%s_meta", namespace), db.NewPrefixConfig(cp, persistenceOptsConfigKey))
2728
if err != nil {
2829
return nil, err
2930
}

0 commit comments

Comments
 (0)