feat: store privacy data with cache (#1308)

* feat: store privacy data with cache * feat: test case
qlcchain · Dec 31, 2020 · de43bfe · de43bfe
1 parent 72f3e57
commit de43bfe
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 33 deletions.
diff --git a/ledger/ledger.go b/ledger/ledger.go
@@ -37,6 +37,7 @@ type LedgerStore interface {
 	EventBus() event.EventBus
 	Get(k []byte, c ...storage.Cache) ([]byte, error)
 	GetObject(k []byte, c ...storage.Cache) (interface{}, []byte, error)
+	Put(k []byte, v interface{}, c ...storage.Cache) error
 	Iterator([]byte, []byte, func([]byte, []byte) error) error
 	IteratorObject(prefix []byte, end []byte, fn func([]byte, interface{}) error) error
 	GenerateSendBlock(block *types.StateBlock, amount types.Balance, prk ed25519.PrivateKey) (*types.StateBlock, error)
@@ -673,14 +674,22 @@ func (l *Ledger) GetObject(k []byte, c ...storage.Cache) (interface{}, []byte, e
 	return nil, v, nil
 }
 
-func (l *Ledger) Put(key []byte, value interface{}) error {
-	c := l.cache.GetCache()
-	return c.Put(key, value)
+func (l *Ledger) Put(key []byte, value interface{}, c ...storage.Cache) error {
+	if len(c) > 0 {
+		return c[0].Put(key, value)
+	} else {
+		c := l.cache.GetCache()
+		return c.Put(key, value)
+	}
 }
 
-func (l *Ledger) Delete(k []byte) error {
-	c := l.cache.GetCache()
-	return c.Delete(k)
+func (l *Ledger) Delete(k []byte, c ...storage.Cache) error {
+	if len(c) > 0 {
+		return c[0].Delete(k)
+	} else {
+		c := l.cache.GetCache()
+		return c.Delete(k)
+	}
 }
 
 func (l *Ledger) getFromStore(key []byte, batch ...storage.Batch) ([]byte, error) {

diff --git a/ledger/ledger_privacy.go b/ledger/ledger_privacy.go
@@ -9,37 +9,37 @@ import (
 )
 
 type PrivacyStore interface {
-	AddBlockPrivatePayload(hash types.Hash, payload []byte) error
-	DeleteBlockPrivatePayload(hash types.Hash) error
-	GetBlockPrivatePayload(hash types.Hash) ([]byte, error)
+	AddBlockPrivatePayload(hash types.Hash, payload []byte, c ...storage.Cache) error
+	DeleteBlockPrivatePayload(hash types.Hash, c ...storage.Cache) error
+	GetBlockPrivatePayload(hash types.Hash, c ...storage.Cache) ([]byte, error)
 }
 
-func (l *Ledger) AddBlockPrivatePayload(hash types.Hash, payload []byte) error {
+func (l *Ledger) AddBlockPrivatePayload(hash types.Hash, payload []byte, c ...storage.Cache) error {
 	if len(payload) == 0 {
 		payload = []byte{1}
 	}
 	k, err := storage.GetKeyOfParts(storage.KeyPrefixPrivatePayload, hash)
 	if err != nil {
 		return err
 	}
-	return l.store.Put(k, payload)
+	return l.Put(k, payload, c...)
 }
 
-func (l *Ledger) DeleteBlockPrivatePayload(hash types.Hash) error {
+func (l *Ledger) DeleteBlockPrivatePayload(hash types.Hash, c ...storage.Cache) error {
 	k, err := storage.GetKeyOfParts(storage.KeyPrefixPrivatePayload, hash)
 	if err != nil {
 		return err
 	}
-	return l.store.Delete(k)
+	return l.Delete(k, c...)
 }
 
-func (l *Ledger) GetBlockPrivatePayload(hash types.Hash) ([]byte, error) {
+func (l *Ledger) GetBlockPrivatePayload(hash types.Hash, c ...storage.Cache) ([]byte, error) {
 	k, err := storage.GetKeyOfParts(storage.KeyPrefixPrivatePayload, hash)
 	if err != nil {
 		return nil, err
 	}
 
-	pl, err := l.store.Get(k)
+	pl, err := l.Get(k, c...)
 	if err != nil {
 		if err == storage.KeyNotFound {
 			return nil, errors.New("block private payload not found")

diff --git a/ledger/ledger_privacy_test.go b/ledger/ledger_privacy_test.go
@@ -39,3 +39,35 @@ func TestLedger_BlockPrivatePayload(t *testing.T) {
 		t.Fatal("deleted payload exist")
 	}
 }
+
+func TestLedger_BlockPrivatePayload_Cache(t *testing.T) {
+	teardownTestCase, l := setupTestCase(t)
+	defer teardownTestCase(t)
+
+	blk := mock.StateBlockWithoutWork()
+	blkHash := blk.GetHash()
+	pl := util.RandomFixedBytes(256)
+
+	err := l.AddBlockPrivatePayload(blkHash, pl, l.cache.GetCache())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	plRet, err := l.GetBlockPrivatePayload(blkHash, l.cache.GetCache())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if bytes.Compare(plRet, pl) != 0 {
+		t.Fatal("payload not equal")
+	}
+
+	err = l.DeleteBlockPrivatePayload(blkHash, l.cache.GetCache())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	plRet, err = l.GetBlockPrivatePayload(blkHash, l.cache.GetCache())
+	if err == nil {
+		t.Fatal("deleted payload exist")
+	}
+}
diff --git a/ledger/ledger_test.go b/ledger/ledger_test.go
@@ -465,6 +465,35 @@ func TestLedger_Cache(t *testing.T) {
 	t.Log(l.GetCacheStat())
 }
 
+func TestLedger_Put(t *testing.T) {
+	teardownTestCase, l := setupTestCase(t)
+	defer teardownTestCase(t)
+
+	c := l.cache.GetCache()
+	// get from ledger cache
+	key2 := []byte{1, 2, 4}
+	if err := l.Put(key2, []byte{4, 5, 6}, c); err != nil {
+		t.Fatal(err)
+	}
+	if i, r, err := l.GetObject(key2); err != nil || i == nil || r != nil {
+		t.Fatal(err, i, r)
+	} else {
+		t.Log(i)
+	}
+
+	// ledger put
+	key3 := []byte{1, 2, 5}
+	if err := l.Put(key3, []byte{4, 5, 6}, l.cache.GetCache()); err != nil {
+		t.Fatal(err)
+	}
+	if err := l.Delete(key3, l.cache.GetCache()); err != nil {
+		t.Fatal(err)
+	}
+	if i, r, err := l.GetObject(key3); err != storage.KeyNotFound || i != nil || r != nil {
+		t.Fatal(err, i, r)
+	}
+}
+
 func TestLedger_UCache(t *testing.T) {
 	teardownTestCase, l := setupTestCase(t)
 	defer teardownTestCase(t)

diff --git a/mock/mocks/store.go b/mock/mocks/store.go
diff --git a/rpc/grpc/apis/ledger_test.go b/rpc/grpc/apis/ledger_test.go
@@ -153,7 +153,7 @@ func TestLedgerAPI_AccountHistoryTopn(t *testing.T) {
 		t.Fatal(err)
 	}
 	if len(r.GetBlocks()) != 4 {
-		t.Fatal()
+		t.Fatal(len(r.GetBlocks()))
 	}
 }