this commit does the following:

- all the fungible tests have OnlyUnit set to true. - RestoreTMS will only take care of the Pending transaction. The git issue (hyperledger-labs#766) tracks the restructuring of the checks and recovery functions Signed-off-by: Angelo De Caro <[email protected]>
alexandrosfilios · Sep 26, 2024 · accc933 · accc933
1 parent 4584d89
commit accc933
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/integration/token/fungible/dloghsm/dlog_test.go b/integration/token/fungible/dloghsm/dlog_test.go
@@ -58,6 +58,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, mask int, factor int, names
 			WebEnabled:      mask&WebEnabled > 0,
 			SDKs:            []api.SDK{&fdlog.SDK{}},
 			ReplicationOpts: opts,
+			OnlyUnity:       true,
 		},
 	))
 	return ts, selector

diff --git a/integration/token/fungible/fabtoken/fabtoken_test.go b/integration/token/fungible/fabtoken/fabtoken_test.go
@@ -66,6 +66,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 			ReplicationOpts: opts,
 			WebEnabled:      true, // Needed for the Remote Wallet with websockets
 			//FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
+			OnlyUnity: true,
 		},
 	))
 	return ts, selector

diff --git a/integration/token/fungible/odlog/dlog_test.go b/integration/token/fungible/odlog/dlog_test.go
@@ -41,6 +41,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 			//FSCLogSpec:      "token-sdk=debug:orion-sdk=debug:info",
 			//FSCLogSpec:      "token-sdk=debug:orion-sdk=debug:view-sdk.services.comm=debug:info",
 			ReplicationOpts: opts,
+			OnlyUnity:       true,
 		},
 	))
 	return ts, selector

diff --git a/integration/token/fungible/ofabtoken/fabtoken_test.go b/integration/token/fungible/ofabtoken/fabtoken_test.go
@@ -39,6 +39,7 @@ func newTestSuite(commType fsc.P2PCommunicationType, factor int, names ...string
 			Aries:           true,
 			SDKs:            []api.SDK{&ofabtoken.SDK{}},
 			ReplicationOpts: opts,
+			OnlyUnity:       true,
 		},
 	))
 	return ts, selector

diff --git a/token/services/auditor/manager.go b/token/services/auditor/manager.go
@@ -67,6 +67,7 @@ func (cm *Manager) Auditor(tmsID token.TMSID) (*Auditor, error) {
 	return cm.getAuditor(tmsID)
 }
 
+// RestoreTMS restores the auditdb corresponding to the passed TMS ID.
 func (cm *Manager) RestoreTMS(tmsID token.TMSID) error {
 	logger.Infof("restore audit dbs for entry [%s]...", tmsID)
 	if err := cm.restore(tmsID); err != nil {
@@ -134,7 +135,7 @@ func (cm *Manager) restore(tmsID token.TMSID) error {
 	if err != nil {
 		return errors.WithMessagef(err, "failed to get auditor for [%s]", tmsID)
 	}
-	it, err := auditor.auditDB.TokenRequests(auditdb.QueryTokenRequestsParams{Statuses: []TxStatus{auditdb.Pending, auditdb.Unknown, auditdb.Deleted}})
+	it, err := auditor.auditDB.TokenRequests(auditdb.QueryTokenRequestsParams{Statuses: []TxStatus{auditdb.Pending}})
 	if err != nil {
 		return errors.Errorf("failed to get tx iterator for [%s]", tmsID)
 	}

diff --git a/token/services/tokens/tokens.go b/token/services/tokens/tokens.go
@@ -119,7 +119,7 @@ func (t *Tokens) Append(ctx context.Context, tmsID token.TMSID, txID string, req
 	if err = ts.Commit(); err != nil {
 		return errors.WithMessagef(err, "transaction [%s], failed to commit tokens to database", txID)
 	}
-	logger.Debugf("transaction [%s], committed tokens to database", txID)
+	logger.Debugf("transaction [%s], committed tokens [%d:%d] to database", txID, len(toAppend), len(toSpend))
 
 	return nil
 }

diff --git a/token/services/ttx/manager.go b/token/services/ttx/manager.go
@@ -108,6 +108,7 @@ func (m *Manager) newDB(tmsID token.TMSID) (*DB, error) {
 	return wrapper, nil
 }
 
+// RestoreTMS restores the auditdb corresponding to the passed TMS ID.
 func (m *Manager) RestoreTMS(tmsID token.TMSID) error {
 	net, err := m.networkProvider.GetNetwork(tmsID.Network, tmsID.Channel)
 	if err != nil {
@@ -119,7 +120,7 @@ func (m *Manager) RestoreTMS(tmsID token.TMSID) error {
 		return errors.WithMessagef(err, "failed to get db for [%s:%s]", tmsID.Network, tmsID.Channel)
 	}
 
-	it, err := db.ttxDB.TokenRequests(ttxdb.QueryTokenRequestsParams{Statuses: []TxStatus{driver.Pending, driver.Unknown, driver.Deleted}})
+	it, err := db.ttxDB.TokenRequests(ttxdb.QueryTokenRequestsParams{Statuses: []TxStatus{driver.Pending}})
 	if err != nil {
 		return errors.WithMessagef(err, "failed to get tx iterator for [%s:%s:%s]", tmsID.Network, tmsID.Channel, tmsID)
 	}