-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #82 from s7techlab/event-block-range-refactoring
block range refactoring, allows to set seek to block
- Loading branch information
Showing
5 changed files
with
338 additions
and
184 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| fabPeer "github.com/hyperledger/fabric-protos-go/peer" | ||
| "github.com/hyperledger/fabric/msp" | ||
| "go.uber.org/zap" | ||
|
|
||
| "github.com/s7techlab/hlf-sdk-go/v2/api" | ||
| "github.com/s7techlab/hlf-sdk-go/v2/client/chaincode" | ||
| "github.com/s7techlab/hlf-sdk-go/v2/client/chaincode/txwaiter" | ||
| ) | ||
|
|
||
| func (c *core) Invoke( | ||
| ctx context.Context, | ||
| chanName string, | ||
| ccName string, | ||
| args [][]byte, | ||
| identity msp.SigningIdentity, | ||
| transient map[string][]byte, | ||
| txWaiterType string, | ||
| ) (*fabPeer.Response, string, error) { | ||
| doOpts := []api.DoOption{} | ||
|
|
||
| switch txWaiterType { | ||
| case "": | ||
| doOpts = append(doOpts, chaincode.WithTxWaiter(txwaiter.Self)) | ||
| case api.TxWaiterSelfType: | ||
| doOpts = append(doOpts, chaincode.WithTxWaiter(txwaiter.Self)) | ||
| case api.TxWaiterAllType: | ||
| doOpts = append(doOpts, chaincode.WithTxWaiter(txwaiter.All)) | ||
| default: | ||
| return nil, "", fmt.Errorf("invalid tx waiter type. got %v, available: '%v', '%v'", txWaiterType, api.TxWaiterSelfType, api.TxWaiterAllType) | ||
| } | ||
|
|
||
| if identity == nil { | ||
| identity = c.CurrentIdentity() | ||
| } | ||
|
|
||
| ccAPI, err := c.Channel(chanName).Chaincode(ctx, ccName) | ||
| if err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| res, tx, err := ccAPI.Invoke(string(args[0])). | ||
| ArgBytes(args[1:]). | ||
| WithIdentity(identity). | ||
| Transient(transient). | ||
| Do(ctx, doOpts...) | ||
| if err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| return res, string(tx), nil | ||
| } | ||
|
|
||
| func (c *core) Query( | ||
| ctx context.Context, | ||
| chanName string, | ||
| ccName string, | ||
| args [][]byte, | ||
| identity msp.SigningIdentity, | ||
| transient map[string][]byte, | ||
| ) (*fabPeer.Response, error) { | ||
| if identity == nil { | ||
| identity = c.CurrentIdentity() | ||
| } | ||
|
|
||
| ccAPI, err := c.Channel(chanName).Chaincode(ctx, ccName) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| argsStrings := make([]string, 0) | ||
| for _, arg := range args { | ||
| argsStrings = append(argsStrings, string(arg)) | ||
| } | ||
|
|
||
| return ccAPI.Query(argsStrings[0], argsStrings[1:]...). | ||
| WithIdentity(identity). | ||
| Transient(transient). | ||
| Do(ctx) | ||
| } | ||
|
|
||
| func (c *core) Events( | ||
| ctx context.Context, | ||
| chanName string, | ||
| ccName string, | ||
| identity msp.SigningIdentity, | ||
| blockRange ...int64, | ||
| ) (chan *fabPeer.ChaincodeEvent, error) { | ||
|
|
||
| if identity == nil { | ||
| identity = c.CurrentIdentity() | ||
| } | ||
|
|
||
| c.logger.Debug(`block range`, zap.Reflect(`slice`, blockRange)) | ||
| mspID := identity.GetMSPIdentifier() | ||
|
|
||
| dc, err := c.PeerPool().DeliverClient(mspID, identity) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| var seekOpts []api.EventCCSeekOption | ||
| seekOpt, err := NewSeekOptConverter(c).ByBlockRange(ctx, chanName, blockRange...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if seekOpt != nil { | ||
| seekOpts = append(seekOpts, seekOpt) | ||
| } | ||
|
|
||
| subscription, err := dc.SubscribeCC(ctx, chanName, ccName, seekOpts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return subscription.Events(), nil | ||
| } |
Oops, something went wrong.