Skip to content

Commit 0528814

Browse files
committed
use view.WithTimeout
clean jsession package FSC b9bece2d0ce57e207809c748f19f431ef0457d62 remove the need to pass a timeout Signed-off-by: Angelo De Caro <[email protected]>
1 parent 7f097fd commit 0528814

File tree

21 files changed

+223
-130
lines changed

21 files changed

+223
-130
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/gin-gonic/gin v1.10.0
1313
github.com/gobuffalo/packr/v2 v2.7.1
1414
github.com/hashicorp/go-uuid v1.0.3
15-
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250717111311-f6c3bf731689
15+
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250727044521-b9bece2d0ce5
1616
github.com/hyperledger/fabric-chaincode-go/v2 v2.3.0
1717
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5
1818
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,8 +1057,8 @@ github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
10571057
github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
10581058
github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866 h1:Mu/6NJsfl9g3wM15Ue7hqPq4LtgYDoABh8MO4u8aW4g=
10591059
github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866/go.mod h1:9aNHNXsCVy/leGz2gpTC1eOL5QecxbSAGjqsLh4T1LM=
1060-
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250717111311-f6c3bf731689 h1:yR1Fv/9fVNtHNMfGO/9HDDd0Rx4LTQzUCDZsWwgVwwo=
1061-
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250717111311-f6c3bf731689/go.mod h1:34dRgLomeTQYI7fffCYDTiSQSRo9LBsPuq0aWBU5EOA=
1060+
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250727044521-b9bece2d0ce5 h1:niAHrlKMVqL3QBqOq4g61vQN9eKmqMMFQWM2xlArSMU=
1061+
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250727044521-b9bece2d0ce5/go.mod h1:34dRgLomeTQYI7fffCYDTiSQSRo9LBsPuq0aWBU5EOA=
10621062
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc h1:3Ykk6MtyfnlzMOQry9zkxsoLWpCWZwDPqehO/BJwArM=
10631063
github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc/go.mod h1:Kofn6A6WWea1ZM8Rys5aBW9dszwJ7Ywa0kyyYL0TPYw=
10641064
github.com/hyperledger/fabric v1.4.0-rc1.0.20250510200036-435a7f1a780a h1:l9dE3iuE+mKj7K8Tcx904cF8zJpaNQONh3GNZdXnnyc=

integration/token/fungible/views/upgrade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (i *TokensUpgradeInitiatorView) Call(context view.Context) (interface{}, er
113113
assert.NoError(err, "failed to accept new tokens")
114114

115115
// Before completing, the recipient waits for finality of the transaction
116-
_, err = context.RunView(ttx.NewFinalityView(tx, ttx.WithTimeout(1*time.Minute)))
116+
_, err = context.RunView(ttx.NewFinalityView(tx), view.WithTimeout(1*time.Minute))
117117
assert.NoError(err, "new tokens were not committed")
118118

119119
return tx.ID(), nil

token/services/certifier/interactive/service.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ package interactive
99
import (
1010
"fmt"
1111
"sync"
12-
"time"
1312

1413
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
1514
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1615
token2 "github.com/hyperledger-labs/fabric-token-sdk/token"
17-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session"
16+
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/jsession"
1817
"github.com/hyperledger-labs/fabric-token-sdk/token/token"
1918
"github.com/pkg/errors"
2019
)
@@ -60,7 +59,7 @@ func (c *CertificationService) SetWallet(tms *token2.ManagementService, wallet s
6059
func (c *CertificationService) Call(context view.Context) (interface{}, error) {
6160
// 1. receive request
6261
logger.Debugf("receive certification request [%s]", context.ID())
63-
s := session.JSON(context)
62+
s := jsession.FromContext(context)
6463
var cr *CertificationRequest
6564
if err := s.Receive(&cr); err != nil {
6665
return nil, errors.WithMessage(err, "failed receiving certification request")
@@ -162,7 +161,7 @@ func (i *CertificationRequestView) Call(context view.Context) (interface{}, erro
162161
return nil, errors.Errorf("no certifiers defined")
163162
}
164163

165-
s, err := session.NewJSON(context, i, i.certifier)
164+
s, err := jsession.NewJSON(context, i, i.certifier)
166165
if err != nil {
167166
return nil, errors.WithMessagef(err, "failed opening session to [%s]", i.certifier)
168167
}
@@ -178,7 +177,7 @@ func (i *CertificationRequestView) Call(context view.Context) (interface{}, erro
178177
// 3. wait response
179178
logger.Debugf("wait certification request response for [%v]", i.ids)
180179
var certifications [][]byte
181-
if err := s.ReceiveWithTimeout(&certifications, 60*time.Second); err != nil {
180+
if err := s.Receive(&certifications); err != nil {
182181
return nil, errors.WithMessagef(err, "failed receiving certifications [%v] from [%s]", i.ids, i.certifier)
183182
}
184183

token/services/identity/storage/kvs/hashicorp/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/docker/docker v28.0.2+incompatible
99
github.com/docker/go-connections v0.5.0
1010
github.com/hashicorp/vault/api v1.16.0
11-
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250717111311-f6c3bf731689
11+
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250727044521-b9bece2d0ce5
1212
github.com/hyperledger-labs/fabric-token-sdk v0.4.1-0.20250528165839-032fb9265504
1313
github.com/pkg/errors v0.9.1
1414
github.com/stretchr/testify v1.10.0

token/services/identity/storage/kvs/hashicorp/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
107107
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
108108
github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4=
109109
github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA=
110-
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250717111311-f6c3bf731689 h1:yR1Fv/9fVNtHNMfGO/9HDDd0Rx4LTQzUCDZsWwgVwwo=
111-
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250717111311-f6c3bf731689/go.mod h1:34dRgLomeTQYI7fffCYDTiSQSRo9LBsPuq0aWBU5EOA=
110+
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250727044521-b9bece2d0ce5 h1:niAHrlKMVqL3QBqOq4g61vQN9eKmqMMFQWM2xlArSMU=
111+
github.com/hyperledger-labs/fabric-smart-client v0.5.1-0.20250727044521-b9bece2d0ce5/go.mod h1:34dRgLomeTQYI7fffCYDTiSQSRo9LBsPuq0aWBU5EOA=
112112
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=
113113
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
114114
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 h1:RPWTL5wxAb+xDOrsCU3QYZP65305F8v3PaOyzdbPVMU=

token/services/interop/htlc/distribute.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1414
"github.com/hyperledger-labs/fabric-token-sdk/token"
15-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session"
15+
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/jsession"
1616
token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
1717
"github.com/pkg/errors"
1818
)
@@ -95,7 +95,7 @@ func ReceiveTerms(context view.Context) (*Terms, error) {
9595

9696
func (v *termsReceiverView) Call(context view.Context) (interface{}, error) {
9797
terms := &Terms{}
98-
if err := session.JSON(context).Receive(terms); err != nil {
98+
if err := jsession.FromContext(context).Receive(terms); err != nil {
9999
return nil, errors.Wrapf(err, "failed unmarshalling terms")
100100
}
101101
return terms, nil

token/services/network/fabric/endorsement/fsc.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,14 @@ func (e *FSCService) Endorse(context view.Context, requestRaw []byte, signer vie
111111
}
112112
logger.DebugfContext(context.Context(), "request approval via fts endrosers with policy [%s]: [%d]...", e.PolicyType, len(endorsers))
113113

114-
envBoxed, err := e.ViewManager.InitiateView(&RequestApprovalView{
115-
TMSID: e.TmsID,
116-
RequestRaw: requestRaw,
117-
TxID: txID,
118-
Endorsers: endorsers,
119-
}, context.Context())
114+
envBoxed, err := e.ViewManager.InitiateView(
115+
context.Context(),
116+
&RequestApprovalView{
117+
TMSID: e.TmsID,
118+
RequestRaw: requestRaw,
119+
TxID: txID,
120+
Endorsers: endorsers,
121+
})
120122
if err != nil {
121123
return nil, errors.WithMessagef(err, "failed to request approval")
122124
}

token/services/network/fabric/endorsement/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type IdentityProvider interface {
3333
}
3434

3535
type ViewManager interface {
36-
InitiateView(view view.View, ctx context.Context) (interface{}, error)
36+
InitiateView(ctx context.Context, view view.View) (interface{}, error)
3737
}
3838

3939
type ViewRegistry interface {

token/services/network/fabric/network.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ func (l *ledger) Status(id string) (driver.ValidationCode, error) {
7171
}
7272

7373
type ViewManager interface {
74-
InitiateView(view view.View, ctx context.Context) (interface{}, error)
74+
Context() context.Context
75+
InitiateView(ctx context.Context, view view.View) (interface{}, error)
7576
}
7677

7778
type ViewRegistry interface {

0 commit comments

Comments
 (0)