Skip to content

Commit 3560587

Browse files
committed
code hygiene: rm unused ledger APIs
This CR removes the following three unused APIs from the ledger interface: (1) PurgePrivateData() (2) Prune() (3) PrivateDataMinBlockNum() Change-Id: I7383023766d5094fddb2540ef216dbb9ba341e9e Signed-off-by: senthil <cendhu@gmail.com>
1 parent 83f7fa7 commit 3560587

File tree

5 files changed

+0
-270
lines changed

5 files changed

+0
-270
lines changed

core/chaincode/mock/peer_ledger.go

Lines changed: 0 additions & 215 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/committer/committer_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,6 @@ func (m *mockLedger) GetMissingPvtDataTracker() (ledger2.MissingPvtDataTracker,
121121
panic("implement me")
122122
}
123123

124-
func (m *mockLedger) PurgePrivateData(maxBlockNumToRetain uint64) error {
125-
args := m.Called(maxBlockNumToRetain)
126-
return args.Error(0)
127-
}
128-
129-
func (m *mockLedger) PrivateDataMinBlockNum() (uint64, error) {
130-
args := m.Called()
131-
return args.Get(0).(uint64), args.Error(1)
132-
}
133-
134-
func (m *mockLedger) Prune(policy ledger.PrunePolicy) error {
135-
args := m.Called(policy)
136-
return args.Error(0)
137-
}
138-
139124
func createLedger(channelID string) (*common.Block, *mockLedger) {
140125
gb, _ := test.MakeGenesisBlock(channelID)
141126
ledger := &mockLedger{

core/committer/txvalidator/v14/validator_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,21 +1569,6 @@ func (m *mockLedger) CommitWithPvtData(pvtDataAndBlock *ledger.BlockAndPvtData)
15691569
return nil
15701570
}
15711571

1572-
// PurgePrivateData purges the private data
1573-
func (m *mockLedger) PurgePrivateData(maxBlockNumToRetain uint64) error {
1574-
return nil
1575-
}
1576-
1577-
// PrivateDataMinBlockNum returns the lowest retained endorsement block height
1578-
func (m *mockLedger) PrivateDataMinBlockNum() (uint64, error) {
1579-
return 0, nil
1580-
}
1581-
1582-
// Prune prune using policy
1583-
func (m *mockLedger) Prune(policy ledger2.PrunePolicy) error {
1584-
return nil
1585-
}
1586-
15871572
func (m *mockLedger) GetBlockchainInfo() (*common.BlockchainInfo, error) {
15881573
args := m.Called()
15891574
return args.Get(0).(*common.BlockchainInfo), nil

core/ledger/kvledger/kv_ledger.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@ func (l *kvLedger) GetTxValidationCodeByTxID(txID string) (peer.TxValidationCode
276276
return txValidationCode, err
277277
}
278278

279-
//Prune prunes the blocks/transactions that satisfy the given policy
280-
func (l *kvLedger) Prune(policy commonledger.PrunePolicy) error {
281-
return errors.New("not yet implemented")
282-
}
283-
284279
// NewTxSimulator returns new `ledger.TxSimulator`
285280
func (l *kvLedger) NewTxSimulator(txid string) (ledger.TxSimulator, error) {
286281
return l.txtmgmt.NewTxSimulator(txid)
@@ -396,18 +391,6 @@ func (l *kvLedger) GetPvtDataByNum(blockNum uint64, filter ledger.PvtNsCollFilte
396391
return pvtdata, err
397392
}
398393

399-
// Purge removes private read-writes set generated by endorsers at block height lesser than
400-
// a given maxBlockNumToRetain. In other words, Purge only retains private read-write sets
401-
// that were generated at block height of maxBlockNumToRetain or higher.
402-
func (l *kvLedger) PurgePrivateData(maxBlockNumToRetain uint64) error {
403-
return errors.New("not yet implemented")
404-
}
405-
406-
// PrivateDataMinBlockNum returns the lowest retained endorsement block height
407-
func (l *kvLedger) PrivateDataMinBlockNum() (uint64, error) {
408-
return 0, errors.New("not yet implemented")
409-
}
410-
411394
func (l *kvLedger) GetConfigHistoryRetriever() (ledger.ConfigHistoryRetriever, error) {
412395
return l.configHistoryRetriever, nil
413396
}

core/ledger/ledger_interface.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ type PeerLedger interface {
7979
GetPvtDataByNum(blockNum uint64, filter PvtNsCollFilter) ([]*TxPvtData, error)
8080
// CommitWithPvtData commits the block and the corresponding pvt data in an atomic operation
8181
CommitWithPvtData(blockAndPvtdata *BlockAndPvtData) error
82-
// Purge removes private read-writes set generated by endorsers at block height lesser than
83-
// a given maxBlockNumToRetain. In other words, Purge only retains private read-write sets
84-
// that were generated at block height of maxBlockNumToRetain or higher.
85-
PurgePrivateData(maxBlockNumToRetain uint64) error
86-
// PrivateDataMinBlockNum returns the lowest retained endorsement block height
87-
PrivateDataMinBlockNum() (uint64, error)
88-
//Prune prunes the blocks/transactions that satisfy the given policy
89-
Prune(policy commonledger.PrunePolicy) error
9082
// GetConfigHistoryRetriever returns the ConfigHistoryRetriever
9183
GetConfigHistoryRetriever() (ConfigHistoryRetriever, error)
9284
// CommitPvtDataOfOldBlocks commits the private data corresponding to already committed block

0 commit comments

Comments
 (0)