Skip to content

Commit e9ad121

Browse files
author
Srinivasan Muralidharan
committed
FAB-853 remove ledger and move ledgernext to ledger
FAB-853 Ledger is removed from . core/peer/peer.go . core/rest/api.go Ledger package itself is removed. "ledgernext" is replaced with "ledger". Change-Id: Ie7dfbd9bf94afa0031aef759fc46929e4fb3b400 Signed-off-by: Srinivasan Muralidharan <[email protected]>
1 parent 0157a51 commit e9ad121

File tree

113 files changed

+93
-6908
lines changed

Some content is hidden

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

113 files changed

+93
-6908
lines changed

‎bddtests/syschaincode/noop/chaincode.go

-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121

2222
"github.com/golang/protobuf/proto"
2323
"github.com/hyperledger/fabric/core/chaincode/shim"
24-
ld "github.com/hyperledger/fabric/core/ledger"
2524
"github.com/hyperledger/fabric/protos"
2625
)
2726

@@ -40,10 +39,6 @@ type SystemChaincode struct {
4039

4140
func (t *SystemChaincode) getLedger() ledgerHandler {
4241
if t.mockLedgerH == nil {
43-
lh, err := ld.GetLedger()
44-
if err == nil {
45-
return lh
46-
}
4742
panic("Chaincode is unable to get the ledger.")
4843
} else {
4944
return t.mockLedgerH

‎core/chaincode/chaincode_support.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/hyperledger/fabric/core/container"
3535
"github.com/hyperledger/fabric/core/container/ccintf"
3636
"github.com/hyperledger/fabric/core/crypto"
37-
ledgernext "github.com/hyperledger/fabric/core/ledgernext"
37+
"github.com/hyperledger/fabric/core/ledger"
3838
"github.com/hyperledger/fabric/flogging"
3939
pb "github.com/hyperledger/fabric/protos"
4040
)
@@ -64,8 +64,8 @@ func init() {
6464
}
6565

6666
//use this for ledger access and make sure TXSimulator is being used
67-
func getTxSimulator(context context.Context) ledgernext.TxSimulator {
68-
if txsim, ok := context.Value(TXSimulatorKey).(ledgernext.TxSimulator); ok {
67+
func getTxSimulator(context context.Context) ledger.TxSimulator {
68+
if txsim, ok := context.Value(TXSimulatorKey).(ledger.TxSimulator); ok {
6969
return txsim
7070
}
7171
panic("!!!---Not Using ledgernext---!!!")

‎core/chaincode/exectransaction_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"github.com/hyperledger/fabric/core/container"
3232
"github.com/hyperledger/fabric/core/container/ccintf"
3333
"github.com/hyperledger/fabric/core/crypto"
34-
ledgernext "github.com/hyperledger/fabric/core/ledgernext"
35-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
34+
"github.com/hyperledger/fabric/core/ledger"
35+
"github.com/hyperledger/fabric/core/ledger/kvledger"
3636
"github.com/hyperledger/fabric/core/util"
3737
"github.com/hyperledger/fabric/membersrvc/ca"
3838
pb "github.com/hyperledger/fabric/protos"
@@ -154,7 +154,7 @@ func finitPeer(lis net.Listener) {
154154
os.RemoveAll(filepath.Join(os.TempDir(), "hyperledger"))
155155
}
156156

157-
func startTxSimulation(ctxt context.Context) (context.Context, ledgernext.TxSimulator, error) {
157+
func startTxSimulation(ctxt context.Context) (context.Context, ledger.TxSimulator, error) {
158158
ledgername := string(DefaultChain)
159159
lgr := kvledger.GetLedger(ledgername)
160160
txsim, err := lgr.NewTxSimulator()
@@ -166,7 +166,7 @@ func startTxSimulation(ctxt context.Context) (context.Context, ledgernext.TxSimu
166166
return ctxt, txsim, nil
167167
}
168168

169-
func endTxSimulation(txsim ledgernext.TxSimulator, payload []byte, commit bool) error {
169+
func endTxSimulation(txsim ledger.TxSimulator, payload []byte, commit bool) error {
170170
txsim.Done()
171171
ledgername := string(DefaultChain)
172172
if lgr := kvledger.GetLedger(ledgername); lgr != nil {
@@ -361,7 +361,7 @@ func invoke(ctx context.Context, spec *pb.ChaincodeSpec) (ccevt *pb.ChaincodeEve
361361
return nil, uuid, nil, fmt.Errorf("Error invoking chaincode: %s ", err)
362362
}
363363

364-
var txsim ledgernext.TxSimulator
364+
var txsim ledger.TxSimulator
365365
ctx, txsim, err = startTxSimulation(ctx)
366366
if err != nil {
367367
return nil, uuid, nil, fmt.Errorf("Failed to get handle to simulator: %s ", err)
@@ -1120,7 +1120,7 @@ func TestChaincodeQueryChaincodeWithSec(t *testing.T) {
11201120

11211121
// Test the invocation of a transaction.
11221122
func TestRangeQuery(t *testing.T) {
1123-
//TODO enable after ledgernext enables RangeQuery
1123+
//TODO enable after ledger enables RangeQuery
11241124
t.Skip()
11251125

11261126
lis, err := initPeer()

‎core/chaincode/handler.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/golang/protobuf/proto"
2626
ccintf "github.com/hyperledger/fabric/core/container/ccintf"
2727
"github.com/hyperledger/fabric/core/crypto"
28-
ledgernext "github.com/hyperledger/fabric/core/ledgernext"
28+
"github.com/hyperledger/fabric/core/ledger"
2929
"github.com/hyperledger/fabric/core/util"
3030
pb "github.com/hyperledger/fabric/protos"
3131
"github.com/looplab/fsm"
@@ -58,9 +58,9 @@ type transactionContext struct {
5858
responseNotifier chan *pb.ChaincodeMessage
5959

6060
// tracks open iterators used for range queries
61-
rangeQueryIteratorMap map[string]ledgernext.ResultsIterator
61+
rangeQueryIteratorMap map[string]ledger.ResultsIterator
6262

63-
txsimulator ledgernext.TxSimulator
63+
txsimulator ledger.TxSimulator
6464
}
6565

6666
type nextStateInfo struct {
@@ -123,7 +123,7 @@ func (handler *Handler) createTxContext(ctxt context.Context, txid string, tx *p
123123
return nil, fmt.Errorf("txid:%s exists", txid)
124124
}
125125
txctx := &transactionContext{transactionSecContext: tx, responseNotifier: make(chan *pb.ChaincodeMessage, 1),
126-
rangeQueryIteratorMap: make(map[string]ledgernext.ResultsIterator)}
126+
rangeQueryIteratorMap: make(map[string]ledger.ResultsIterator)}
127127
handler.txCtxs[txid] = txctx
128128
txctx.txsimulator = getTxSimulator(ctxt)
129129

@@ -145,13 +145,13 @@ func (handler *Handler) deleteTxContext(txid string) {
145145
}
146146

147147
func (handler *Handler) putRangeQueryIterator(txContext *transactionContext, txid string,
148-
rangeScanIterator ledgernext.ResultsIterator) {
148+
rangeScanIterator ledger.ResultsIterator) {
149149
handler.Lock()
150150
defer handler.Unlock()
151151
txContext.rangeQueryIteratorMap[txid] = rangeScanIterator
152152
}
153153

154-
func (handler *Handler) getRangeQueryIterator(txContext *transactionContext, txid string) ledgernext.ResultsIterator {
154+
func (handler *Handler) getRangeQueryIterator(txContext *transactionContext, txid string) ledger.ResultsIterator {
155155
handler.Lock()
156156
defer handler.Unlock()
157157
return txContext.rangeQueryIteratorMap[txid]
@@ -727,7 +727,7 @@ func (handler *Handler) handleRangeQueryState(msg *pb.ChaincodeMessage) {
727727
return
728728
}
729729
//PDMP - let it panic if not KV
730-
kv := qresult.(ledgernext.KV)
730+
kv := qresult.(ledger.KV)
731731
// Decrypt the data if the confidential is enabled
732732
decryptedValue, decryptErr := handler.decrypt(msg.Txid, kv.Value)
733733
if decryptErr != nil {
@@ -835,7 +835,7 @@ func (handler *Handler) handleRangeQueryStateNext(msg *pb.ChaincodeMessage) {
835835
return
836836
}
837837
//PDMP - let it panic if not KV
838-
kv := qresult.(ledgernext.KV)
838+
kv := qresult.(ledger.KV)
839839
// Decrypt the data if the confidential is enabled
840840
decryptedValue, decryptErr := handler.decrypt(msg.Txid, kv.Value)
841841
if decryptErr != nil {

‎core/chaincode/importsysccs.go

-8
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,12 @@ package chaincode
1818

1919
import (
2020
//import system chain codes here
21-
"github.com/hyperledger/fabric/bddtests/syschaincode/noop"
2221
"github.com/hyperledger/fabric/core/system_chaincode/escc"
2322
"github.com/hyperledger/fabric/core/system_chaincode/vscc"
2423
)
2524

2625
//see systemchaincode_test.go for an example using "sample_syscc"
2726
var systemChaincodes = []*SystemChaincode{
28-
{
29-
Enabled: true,
30-
Name: "noop",
31-
Path: "github.com/hyperledger/fabric/bddtests/syschaincode/noop",
32-
InitArgs: [][]byte{},
33-
Chaincode: &noop.SystemChaincode{},
34-
},
3527
{
3628
Enabled: true,
3729
Name: "lccc",

‎core/chaincode/lccc.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/golang/protobuf/proto"
2323
"github.com/hyperledger/fabric/core/chaincode/shim"
24-
ledger "github.com/hyperledger/fabric/core/ledgernext"
25-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
24+
"github.com/hyperledger/fabric/core/ledger"
25+
"github.com/hyperledger/fabric/core/ledger/kvledger"
2626
pb "github.com/hyperledger/fabric/protos"
2727
"github.com/op/go-logging"
2828
"golang.org/x/net/context"

‎core/chaincode/sysccapi.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"github.com/hyperledger/fabric/core/chaincode/shim"
2525
"github.com/hyperledger/fabric/core/container/inproccontroller"
26-
ledgernext "github.com/hyperledger/fabric/core/ledgernext"
27-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
26+
"github.com/hyperledger/fabric/core/ledger"
27+
"github.com/hyperledger/fabric/core/ledger/kvledger"
2828
"github.com/hyperledger/fabric/protos"
2929
"github.com/op/go-logging"
3030
"github.com/spf13/viper"
@@ -80,7 +80,7 @@ func RegisterSysCC(syscc *SystemChaincode) error {
8080
chainName := string(DefaultChain)
8181

8282
lgr := kvledger.GetLedger(chainName)
83-
var txsim ledgernext.TxSimulator
83+
var txsim ledger.TxSimulator
8484
if txsim, err = lgr.NewTxSimulator(); err != nil {
8585
return err
8686
}

‎core/chaincode/systemchaincode_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222
"time"
2323

24-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
24+
"github.com/hyperledger/fabric/core/ledger/kvledger"
2525
"github.com/hyperledger/fabric/core/system_chaincode/samplesyscc"
2626
"github.com/hyperledger/fabric/core/util"
2727
pb "github.com/hyperledger/fabric/protos"

‎core/committer/noopssinglechain/committer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/golang/protobuf/proto"
2727
"github.com/hyperledger/fabric/core/chaincode"
2828
"github.com/hyperledger/fabric/core/committer"
29-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
29+
"github.com/hyperledger/fabric/core/ledger/kvledger"
3030
ab "github.com/hyperledger/fabric/orderer/atomicbroadcast"
3131
"golang.org/x/net/context"
3232
"google.golang.org/grpc"

‎core/crypto/validator_validity_period.go

-95
This file was deleted.

‎core/endorser/endorser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"golang.org/x/net/context"
2525

2626
"github.com/hyperledger/fabric/core/chaincode"
27-
ledger "github.com/hyperledger/fabric/core/ledgernext"
28-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
27+
"github.com/hyperledger/fabric/core/ledger"
28+
"github.com/hyperledger/fabric/core/ledger/kvledger"
2929
"github.com/hyperledger/fabric/core/peer"
3030
"github.com/hyperledger/fabric/core/util"
3131
pb "github.com/hyperledger/fabric/protos"

‎core/endorser/endorser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/hyperledger/fabric/core/container"
3131
"github.com/hyperledger/fabric/core/crypto"
3232
"github.com/hyperledger/fabric/core/db"
33-
"github.com/hyperledger/fabric/core/ledgernext/kvledger"
33+
"github.com/hyperledger/fabric/core/ledger/kvledger"
3434
u "github.com/hyperledger/fabric/core/util"
3535
pb "github.com/hyperledger/fabric/protos"
3636
"github.com/spf13/viper"

‎core/ledger/README.md

-17
This file was deleted.

‎core/ledgernext/ReadWriteSet.md ‎core/ledger/ReadWriteSet.md

File renamed without changes.

0 commit comments

Comments
 (0)