From 48b696dc11460cc422a24d19cefa6cf18d186b0e Mon Sep 17 00:00:00 2001 From: Alexandros Filios Date: Fri, 18 Apr 2025 08:12:00 +0200 Subject: [PATCH 1/3] Update FSC Signed-off-by: Alexandros Filios --- go.mod | 3 +-- go.sum | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index a4c708e986..22e8dda2e6 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/gobuffalo/packr/v2 v2.7.1 github.com/hashicorp/go-uuid v1.0.3 - github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250402105017-cc6f67ed1237 + github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250417072119-cde75c6e2b66 github.com/hyperledger-labs/orion-sdk-go v0.2.10 github.com/hyperledger-labs/orion-server v0.2.10 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2 @@ -150,7 +150,6 @@ require ( github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/jbenet/goprocess v0.1.4 // indirect - github.com/jellydator/ttlcache/v2 v2.11.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kilic/bls12-381 v0.1.0 // indirect github.com/klauspost/compress v1.17.11 // indirect diff --git a/go.sum b/go.sum index e1ebde668c..3cf07079b5 100644 --- a/go.sum +++ b/go.sum @@ -1081,8 +1081,8 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250402105017-cc6f67ed1237 h1:rTnM7a/KXCTrO0Ubx+tW87Da30/cS9/356i0KGAHUcc= -github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250402105017-cc6f67ed1237/go.mod h1:fiPO9SpiJk2amIUpTlK5O1eh0zroN3+FwJjBO5L52rs= +github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250417072119-cde75c6e2b66 h1:jrTaV1HI1h1w2ZIk3U/ogIBZYaqoW5Cq1r7f+2yPqaI= +github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250417072119-cde75c6e2b66/go.mod h1:0uk7mRq5G1JTb0txPR2PL4TQZntcFZjhRpXZvmrajOs= github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s= github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY= github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw= @@ -1140,8 +1140,6 @@ github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPw github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= -github.com/jellydator/ttlcache/v2 v2.11.1 h1:AZGME43Eh2Vv3giG6GeqeLeFXxwxn1/qHItqWZl6U64= -github.com/jellydator/ttlcache/v2 v2.11.1/go.mod h1:RtE5Snf0/57e+2cLWFYWCCsLas2Hy3c5Z4n14XmSvTI= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= @@ -2122,7 +2120,6 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210112230658-8b4aab62c064/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= From 87190d64dd638c1b202058fb7cef388a7a0a7776 Mon Sep 17 00:00:00 2001 From: Alexandros Filios Date: Fri, 18 Apr 2025 10:41:47 +0200 Subject: [PATCH 2/3] testing Signed-off-by: Alexandros Filios --- integration/ports.go | 4 ++-- integration/token/fungible/tests.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/integration/ports.go b/integration/ports.go index 08bfcc198a..d48a57cdac 100755 --- a/integration/ports.go +++ b/integration/ports.go @@ -59,8 +59,8 @@ var ( } AllTestTypes = []*InfrastructureType{ - WebSocketNoReplication, - LibP2PNoReplication, + //WebSocketNoReplication, + //LibP2PNoReplication, WebSocketWithReplication, } ) diff --git a/integration/token/fungible/tests.go b/integration/token/fungible/tests.go index 1c8f486b53..e27f9d2faf 100644 --- a/integration/token/fungible/tests.go +++ b/integration/token/fungible/tests.go @@ -816,6 +816,7 @@ func TestAll(network *integration.Infrastructure, auditorId string, onRestart On CheckBalanceAndHolding(network, alice, "", "Spendable", 1, auditor) CheckBalanceAndHolding(network, bob, "", "Spendable", 2, auditor) CheckAuditorDB(network, auditor, "", nil) + panic("all ok") } func TestSelector(network *integration.Infrastructure, auditorId string, sel *token3.ReplicaSelector) { From 5486ea0d3185074779059457f56e05e318c67fb7 Mon Sep 17 00:00:00 2001 From: Alexandros Filios Date: Fri, 18 Apr 2025 10:42:20 +0200 Subject: [PATCH 3/3] testing Signed-off-by: Alexandros Filios --- integration/token/fungible/dloghsm/dlog_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/token/fungible/dloghsm/dlog_test.go b/integration/token/fungible/dloghsm/dlog_test.go index b658721a68..95639a8fa8 100644 --- a/integration/token/fungible/dloghsm/dlog_test.go +++ b/integration/token/fungible/dloghsm/dlog_test.go @@ -56,7 +56,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, mask int, factor int, names HSM: mask&HSM > 0, WebEnabled: mask&WebEnabled > 0, SDKs: []api.SDK{&fdlog.SDK{}}, - // FSCLogSpec: "token-sdk=debug:fabric-sdk=debug:info", + FSCLogSpec: "token-sdk=debug:fabric-sdk=debug:info", ReplicationOpts: opts, OnlyUnity: true, },