fix error dure missed rebase (#751)

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
hyperledger-labs · Sep 4, 2024 · 79f3889 · 79f3889
1 parent f6a3c9b
commit 79f3889
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/token/services/network/fabric/fts/approval.go b/token/services/network/fabric/fts/approval.go
@@ -17,9 +17,11 @@ import (
  "github.com/hyperledger-labs/fabric-token-sdk/token/core/common"
  driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
  "github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
+ "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/keys"
  "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
  "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/driver"
  "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb"
+ "github.com/hyperledger-labs/fabric-token-sdk/token/token"
  "github.com/pkg/errors"
 )
 
@@ -146,7 +148,11 @@ func (r *RequestApprovalResponderView) Call(context view.Context) (interface{},
 
  // validate token request
  logger.Debugf("Validate TX [%s]", tx.ID())
- actions, validationMetadata, err := r.validate(context, tms, tx, requestAnchor, requestRaw, func(key string) ([]byte, error) {
+ actions, validationMetadata, err := r.validate(context, tms, tx, requestAnchor, requestRaw, func(id token.ID) ([]byte, error) {
+ key, err := keys.CreateTokenKey(id.TxId, id.Index)
+ if err != nil {
+ return nil, errors.WithMessagef(err, "failed to create token key for id [%s]", id)
+ }
  return rws.GetDirectState(tms.Namespace(), key)
  })
 

diff --git a/token/validator.go b/token/validator.go
@@ -10,6 +10,7 @@ import (
  "context"
 
  "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
+ "github.com/hyperledger-labs/fabric-token-sdk/token/token"
 )
 
 // Ledger models a read-only ledger
@@ -54,14 +55,14 @@ func (c *Validator) UnmarshallAndVerifyWithMetadata(ctx context.Context, ledger
  return res, meta, nil
 }
 
-func NewLedgerFromGetter(f driver.GetStateFnc) *stateGetter {
- return &stateGetter{f: f}
-}
-
 type stateGetter struct {
  f driver.GetStateFnc
 }
 
-func (g *stateGetter) GetState(key string) ([]byte, error) {
- return g.f(key)
+func NewLedgerFromGetter(f driver.GetStateFnc) *stateGetter {
+ return &stateGetter{f: f}
+}
+
+func (g *stateGetter) GetState(id token.ID) ([]byte, error) {
+ return g.f(id)
 }