Skip to content

Commit 302bd7d

Browse files
authored
Merge pull request #171 from hyperledger/release_upgrades
Update to 1.5.5 FireFly common
2 parents f0495f9 + 99cd0c5 commit 302bd7d

File tree

5 files changed

+168
-10
lines changed

5 files changed

+168
-10
lines changed

config.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
|count|The maximum number of times to retry|`int`|`5`
125125
|enabled|Enables retries|`boolean`|`false`
126126
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
127-
|factor|(Deprecated) Please refer to `connector.queryLoopRetry.factor` to understand its original purpose and use that instead|`float32`|`<nil>`
127+
|factor|(Deprecated) Please refer to `connector.queryLoopRetry.factor` to understand its original purpose and use that instead|`float32`|`2`
128128
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
129129
|initialDelay|(Deprecated) Please refer to `connector.queryLoopRetry.initialDelay` to understand its original purpose and use that instead|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
130130
|maxDelay|(Deprecated) Please refer to `connector.queryLoopRetry.maxDelay` to understand its original purpose and use that instead|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
@@ -156,6 +156,7 @@
156156

157157
|Key|Description|Type|Default Value|
158158
|---|-----------|----|-------------|
159+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
159160
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
160161
|enabled|When true a WebSocket is established for block listening, in addition to the HTTP RPC connections used for other functions|`boolean`|`false`
161162
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.23.0
44

55
require (
66
github.com/hashicorp/golang-lru v1.0.2
7-
github.com/hyperledger/firefly-common v1.5.1
7+
github.com/hyperledger/firefly-common v1.5.5
88
github.com/hyperledger/firefly-signer v1.1.21
9-
github.com/hyperledger/firefly-transaction-manager v1.3.20
9+
github.com/hyperledger/firefly-transaction-manager v1.4.0
1010
github.com/sirupsen/logrus v1.9.3
1111
github.com/spf13/cobra v1.8.0
1212
github.com/stretchr/testify v1.9.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
100100
github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
101101
github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
102102
github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
103-
github.com/hyperledger/firefly-common v1.5.1 h1:/DREi1ye1HfYr3GDLBhXuugeMzT4zg9EN2uTYFlVY6M=
104-
github.com/hyperledger/firefly-common v1.5.1/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs=
103+
github.com/hyperledger/firefly-common v1.5.5 h1:UaANgBIT0aBvAk0Yt+Qrn6qXxpwNIrFfwnW3EBivrQs=
104+
github.com/hyperledger/firefly-common v1.5.5/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs=
105105
github.com/hyperledger/firefly-signer v1.1.21 h1:r7cTOw6e/6AtiXLf84wZy6Z7zppzlc191HokW2hv4N4=
106106
github.com/hyperledger/firefly-signer v1.1.21/go.mod h1:axrlSQeKrd124UdHF5L3MkTjb5DeTcbJxJNCZ3JmcWM=
107-
github.com/hyperledger/firefly-transaction-manager v1.3.20 h1:Rs9ZW4XyOk3+mH5XBmcP9yFAeKMBtcJyOPCq4N/MnXY=
108-
github.com/hyperledger/firefly-transaction-manager v1.3.20/go.mod h1:cWiZ5YpvHJryoRoe7loNRn4ciPMq/XvrP5Lw2lopjKg=
107+
github.com/hyperledger/firefly-transaction-manager v1.4.0 h1:l9DCizLTohKtKec5dewNlydhAeko1/DmTfCRF8le9m0=
108+
github.com/hyperledger/firefly-transaction-manager v1.4.0/go.mod h1:mEd9dOH8ds6ajgfPh6nnP3Pd3f8XIZtQRnucqAIJHRs=
109109
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
110110
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
111111
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=

mocks/fftmmocks/manager.go

Lines changed: 159 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mocks/rpcbackendmocks/backend.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)