Skip to content

Commit f32272c

Browse files
fixup! Removed pq dependencies
Signed-off-by: Alexandros Filios <[email protected]>
1 parent 8b4f7bc commit f32272c

File tree

2 files changed

+8
-30
lines changed

2 files changed

+8
-30
lines changed

platform/common/utils/encode.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

platform/view/services/db/driver/notifier/persistence.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package notifier
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
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
1312
)
1413

@@ -35,7 +34,7 @@ func (db *UnversionedPersistenceNotifier[P]) SetState(ns driver2.Namespace, key
3534
if len(val) == 0 {
3635
op = driver.Delete
3736
}
38-
db.Notifier.EnqueueEvent(op, map[driver.ColumnKey]string{"ns": ns, "pkey": utils.EncodeByteA(key)})
37+
db.Notifier.EnqueueEvent(op, map[driver.ColumnKey]string{"ns": ns, "pkey": key})
3938
return nil
4039
}
4140

@@ -48,7 +47,7 @@ func (db *UnversionedPersistenceNotifier[P]) SetStates(ns driver2.Namespace, kvs
4847
if len(val) == 0 {
4948
op = driver.Delete
5049
}
51-
db.Notifier.EnqueueEvent(op, map[driver.ColumnKey]string{"ns": ns, "pkey": utils.EncodeByteA(key)})
50+
db.Notifier.EnqueueEvent(op, map[driver.ColumnKey]string{"ns": ns, "pkey": key})
5251
}
5352
}
5453

@@ -77,7 +76,7 @@ func (db *UnversionedPersistenceNotifier[P]) DeleteState(ns driver2.Namespace, k
7776
if err := db.Persistence.DeleteState(ns, key); err != nil {
7877
return err
7978
}
80-
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": ns, "pkey": utils.EncodeByteA(key)})
79+
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": ns, "pkey": key})
8180
return nil
8281
}
8382

@@ -86,7 +85,7 @@ func (db *UnversionedPersistenceNotifier[P]) DeleteStates(namespace driver2.Name
8685

8786
for _, key := range keys {
8887
if _, ok := errs[key]; !ok {
89-
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": namespace, "pkey": utils.EncodeByteA(key)})
88+
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": namespace, "pkey": key})
9089
}
9190
}
9291

@@ -133,7 +132,7 @@ func (db *VersionedPersistenceNotifier[P]) SetState(namespace driver2.Namespace,
133132
if err := db.Persistence.SetState(namespace, key, value); err != nil {
134133
return err
135134
}
136-
db.Notifier.EnqueueEvent(driver.Update, map[driver.ColumnKey]string{"ns": namespace, "pkey": utils.EncodeByteA(key)})
135+
db.Notifier.EnqueueEvent(driver.Update, map[driver.ColumnKey]string{"ns": namespace, "pkey": key})
137136
return nil
138137
}
139138

@@ -142,7 +141,7 @@ func (db *VersionedPersistenceNotifier[P]) SetStates(ns driver2.Namespace, kvs m
142141

143142
for key := range kvs {
144143
if _, ok := errs[key]; !ok {
145-
db.Notifier.EnqueueEvent(driver.Update, map[driver.ColumnKey]string{"ns": ns, "pkey": utils.EncodeByteA(key)})
144+
db.Notifier.EnqueueEvent(driver.Update, map[driver.ColumnKey]string{"ns": ns, "pkey": key})
146145
}
147146
}
148147

@@ -154,7 +153,7 @@ func (db *VersionedPersistenceNotifier[P]) DeleteStates(namespace driver2.Namesp
154153

155154
for _, key := range keys {
156155
if _, ok := errs[key]; !ok {
157-
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": namespace, "pkey": utils.EncodeByteA(key)})
156+
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": namespace, "pkey": key})
158157
}
159158
}
160159

@@ -183,7 +182,7 @@ func (db *VersionedPersistenceNotifier[P]) DeleteState(ns driver2.Namespace, key
183182
if err := db.Persistence.DeleteState(ns, key); err != nil {
184183
return err
185184
}
186-
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": ns, "pkey": utils.EncodeByteA(key)})
185+
db.Notifier.EnqueueEvent(driver.Delete, map[driver.ColumnKey]string{"ns": ns, "pkey": key})
187186
return nil
188187
}
189188

0 commit comments

Comments
 (0)