Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for confirmations when listening to events #207

Merged
merged 17 commits into from
Apr 20, 2022
Merged

Support for confirmations when listening to events #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a6b77f9
Initial confirmation manager code
peterbroadhurst Mar 22, 2022
48b9f75
More consistent formatting
peterbroadhurst Mar 22, 2022
69be456
Drain on suspend
peterbroadhurst Mar 22, 2022
9467911
Fix concurrent map write when adding multiple subscriptions in parallel
nguyer Mar 30, 2022
8dd4d4f
Add RPC mock to subscription test
nguyer Mar 30, 2022
772e768
Use RWMutex on subscriptions
nguyer Mar 30, 2022
06203cd
Add write lock on recoverSubscriptions
nguyer Mar 30, 2022
0f19286
Close subscription manager in tests
nguyer Mar 30, 2022
95526ad
Add missing mock to unit test
nguyer Mar 30, 2022
a2f6e87
Add e2e test of confirmations
peterbroadhurst Apr 4, 2022
8c04f61
Additional tests for confirmations manager component
peterbroadhurst Apr 4, 2022
d41052c
Close out tests, and add fix for config typo with migration
peterbroadhurst Apr 4, 2022
6739ce9
Update dependencies
peterbroadhurst Apr 4, 2022
318dc31
Invert bool for clarity
peterbroadhurst Apr 4, 2022
c538b4c
Merge branch 'main' of github.com:hyperledger/firefly-ethconnect into…
peterbroadhurst Apr 4, 2022
db25f97
Address review comments
peterbroadhurst Apr 20, 2022
2faf053
Add fix for intermittent error
peterbroadhurst Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
{
"go.lintTool": "golangci-lint"
"go.lintTool": "golangci-lint",
"cSpell.words": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏼

"Debugf",
"hashicorp",
"Infof",
"kvstore",
"smconf",
"stretchr",
"Unconfigured",
"Warnf"
]
}
23 changes: 17 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,43 @@
module github.com/hyperledger/firefly-ethconnect

require (
github.com/Shopify/sarama v1.30.0
github.com/Shopify/sarama v1.32.0
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/ethereum/go-ethereum v1.10.17
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
github.com/go-openapi/jsonreference v0.19.6
github.com/go-openapi/spec v0.20.4
github.com/gorilla/websocket v1.4.2
github.com/go-openapi/swag v0.21.1 // indirect
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
github.com/icza/dyno v0.0.0-20210726202311-f1bafe5d9996
github.com/julienschmidt/httprouter v1.3.0
github.com/kaleido-io/ethbinding v0.0.0-20220104211806-1a198c06124a
github.com/klauspost/compress v1.15.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mholt/archiver v3.1.1+incompatible
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
github.com/nwaples/rardecode v1.1.2 // indirect
github.com/nwaples/rardecode v1.1.3 // indirect
github.com/oklog/ulid/v2 v2.0.2
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.2.1
github.com/spf13/cobra v1.4.0
github.com/spf13/viper v1.8.1 // indirect
github.com/stretchr/testify v1.7.0
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/tidwall/gjson v1.11.0
github.com/tidwall/gjson v1.14.0
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect
golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
gopkg.in/yaml.v2 v2.4.0
)
Expand Down
640 changes: 71 additions & 569 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/contractgateway/smartcontractgw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func NewSmartContractGateway(conf *SmartContractGatewayConf, txnConf *tx.TxnProc
}
syncDispatcher := newSyncDispatcher(processor)
if conf.EventLevelDBPath != "" {
gw.sm = events.NewSubscriptionManager(&conf.SubscriptionManagerConf, rpc, gw.cs, gw.ws)
gw.sm, _ = events.NewSubscriptionManager(&conf.SubscriptionManagerConf, rpc, gw.cs, gw.ws)
err = gw.sm.Init()
if err != nil {
return nil, errors.Errorf(errors.RESTGatewayEventManagerInitFailed, err)
Expand Down
Loading