cleanup

Signed-off-by: Angelo De Caro <[email protected]>
hyperledger-labs · Sep 8, 2023 · e7b2b33 · e7b2b33
1 parent 1879e08
commit e7b2b33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/integration/token/interop/topology.go b/integration/token/interop/topology.go
@@ -533,7 +533,7 @@ func AssetTransferTopology(tokenSDKDriver string) []api.Topology {
 		fabric.WithAnonymousIdentity(),
 		fabric.WithDefaultNetwork("alpha"),
 		token.WithIssuerIdentity("issuer.id1"),
-		token.WithOwnerIdentity(tokenSDKDriver, "issuer.id1.owner"),
+		token.WithOwnerIdentity("issuer.id1.owner"),
 	)
 	issuerAlpha.RegisterViewFactory("issue", &views2.IssueCashViewFactory{})
 	issuerAlpha.RegisterViewFactory("balance", &views2.BalanceViewFactory{})
@@ -551,7 +551,7 @@ func AssetTransferTopology(tokenSDKDriver string) []api.Topology {
 		fabric.WithAnonymousIdentity(),
 		fabric.WithDefaultNetwork("beta"),
 		token.WithIssuerIdentity("issuer.id2"),
-		token.WithOwnerIdentity(tokenSDKDriver, "issuer.id2.owner"),
+		token.WithOwnerIdentity("issuer.id2.owner"),
 	)
 	issuerBeta.RegisterViewFactory("issue", &views2.IssueCashViewFactory{})
 	issuerBeta.RegisterViewFactory("balance", &views2.BalanceViewFactory{})
@@ -577,7 +577,7 @@ func AssetTransferTopology(tokenSDKDriver string) []api.Topology {
 		fabric.WithNetworkOrganization("alpha", "Org2"),
 		fabric.WithAnonymousIdentity(),
 		fabric.WithDefaultNetwork("alpha"),
-		token.WithOwnerIdentity(tokenSDKDriver, "alice.id1"),
+		token.WithOwnerIdentity("alice.id1"),
 	)
 	alice.RegisterResponder(&views2.AcceptCashView{}, &views2.IssueCashView{})
 	alice.RegisterViewFactory("balance", &views2.BalanceViewFactory{})
@@ -595,7 +595,7 @@ func AssetTransferTopology(tokenSDKDriver string) []api.Topology {
 		fabric.WithNetworkOrganization("beta", "Org4"),
 		fabric.WithAnonymousIdentity(),
 		fabric.WithDefaultNetwork("beta"),
-		token.WithOwnerIdentity(tokenSDKDriver, "bob.id1"),
+		token.WithOwnerIdentity("bob.id1"),
 	)
 	bob.RegisterResponder(&views2.AcceptCashView{}, &views2.IssueCashView{})
 	bob.RegisterViewFactory("balance", &views2.BalanceViewFactory{})

diff --git a/token/core/fabtoken/deserializer.go b/token/core/fabtoken/deserializer.go
@@ -108,7 +108,7 @@ func (e *EnrollmentService) GetRevocationHandler(auditInfo []byte) (string, erro
 	}
 
 	// Try to unmarshal it as ScriptInfo
-	si := &htlc.ScriptInfo{}
+	si := &interop.ScriptInfo{}
 	err := json.Unmarshal(auditInfo, si)
 	if err == nil && (len(si.Sender) != 0 || len(si.Recipient) != 0) {
 		if len(si.Recipient) != 0 {