Skip to content

Commit 38e5571

Browse files
refactor(fabric): remove import of fabric's common/ccprovider
Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
1 parent e38bd2d commit 38e5571

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

platform/fabric/core/generic/transaction/proposal.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/protoutil"
1616
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
1717
pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
18-
"github.com/hyperledger/fabric/core/common/ccprovider"
1918
"github.com/hyperledger/fabric/msp"
2019
)
2120

@@ -136,8 +135,13 @@ func UnpackProposal(prop *pb.Proposal) (*UnpackedProposal, error) {
136135
}, nil
137136
}
138137

138+
type txParams struct {
139+
ChannelID string
140+
TxID string
141+
}
142+
139143
func (up *UnpackedProposal) Validate(idDeserializer msp.IdentityDeserializer) error {
140-
logger := decorateLogger(logger, &ccprovider.TransactionParams{
144+
logger := decorateLogger(logger, &txParams{
141145
ChannelID: up.ChannelHeader.ChannelId,
142146
TxID: up.TxID(),
143147
})
@@ -219,7 +223,7 @@ func (up *UnpackedProposal) Validate(idDeserializer msp.IdentityDeserializer) er
219223
return nil
220224
}
221225

222-
func decorateLogger(logger logging.Logger, txParams *ccprovider.TransactionParams) logging.Logger {
226+
func decorateLogger(logger logging.Logger, txParams *txParams) logging.Logger {
223227
return logger.With("channel", txParams.ChannelID, "txID", shorttxid(txParams.TxID))
224228
}
225229

0 commit comments

Comments
 (0)