Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit ea3acdb

Browse files
committed
[FAB-8852] Create Peer and Orderer from factory
This change finishes updating the SDK code and integration tests to create peer and orderer from factory. Change-Id: Iced01db5a6916f8e952e528daf9313ac9751b43f Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent 063fd0b commit ea3acdb

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

pkg/fab/channel/transactor.go

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919

2020
contextImpl "github.com/hyperledger/fabric-sdk-go/pkg/context"
2121
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/endpoint"
22-
"github.com/hyperledger/fabric-sdk-go/pkg/fab/orderer"
2322
"github.com/hyperledger/fabric-sdk-go/pkg/fab/txn"
2423
)
2524

@@ -78,21 +77,17 @@ func orderersFromChannelCfg(ctx context.Client, cfg fab.ChannelCfg) ([]fab.Order
7877

7978
}
8079
if !ok {
81-
o, err := orderer.New(ctx.Config(), orderer.WithURL(target))
82-
// TODO: should we fail hard if we cannot configure a default orderer?
83-
//if err != nil {
84-
// return nil, errors.WithMessage(err, "failed to create orderer from defaults")
85-
//}
86-
if err == nil {
87-
orderers = append(orderers, o)
80+
oCfg = core.OrdererConfig{
81+
URL: target,
8882
}
89-
} else {
90-
o, err := orderer.New(ctx.Config(), orderer.FromOrdererConfig(&oCfg))
91-
if err != nil {
92-
return nil, errors.WithMessage(err, "failed to create orderer from config")
93-
}
94-
orderers = append(orderers, o)
9583
}
84+
85+
o, err := ctx.InfraProvider().CreateOrdererFromConfig(&oCfg)
86+
if err != nil {
87+
return nil, errors.WithMessage(err, "failed to create orderer from config")
88+
}
89+
orderers = append(orderers, o)
90+
9691
}
9792
return orderers, nil
9893
}

pkg/fab/chconfig/chconfig.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
1515
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/msp"
1616
"github.com/hyperledger/fabric-sdk-go/pkg/fab/channel"
17-
"github.com/hyperledger/fabric-sdk-go/pkg/fab/peer"
1817
"github.com/hyperledger/fabric-sdk-go/pkg/fab/resource"
1918
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
2019
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
@@ -140,7 +139,7 @@ func (c *ChannelConfig) queryPeers(reqCtx reqContext.Context) (*ChannelCfg, erro
140139
}
141140

142141
for _, p := range chPeers {
143-
newPeer, err := peer.New(ctx.Config(), peer.FromPeerConfig(&p.NetworkPeer))
142+
newPeer, err := ctx.InfraProvider().CreatePeerFromConfig((&p.NetworkPeer))
144143
if err != nil || newPeer == nil {
145144
return nil, errors.WithMessage(err, "NewPeer failed")
146145
}

0 commit comments

Comments
 (0)