hyperledger-labs
diff --git a/‎integration/token/test_utils.go
+1-1 b/‎integration/token/test_utils.go
+1-1
diff --git a/‎token/services/db/dbtest/tokenlock.go
+4-3 b/‎token/services/db/dbtest/tokenlock.go
+4-3
diff --git a/‎token/services/db/dbtest/tokens.go
+4-1 b/‎token/services/db/dbtest/tokens.go
+4-1
diff --git a/‎token/services/db/dbtest/transactions.go
+2-1 b/‎token/services/db/dbtest/transactions.go
+2-1
diff --git a/‎token/services/db/sql/common/tokenlock_test.go b/‎token/services/db/sql/common/tokenlock_test.go
diff --git a/‎token/services/db/sql/common/transactions_test.go b/‎token/services/db/sql/common/transactions_test.go
diff --git a/‎token/services/ttxdb/db/memory/memory_test.go b/‎token/services/ttxdb/db/memory/memory_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
 	postgres2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/postgres"
 	"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega"
 )
 
 type ReplicationOpts interface {
 
@@ -12,6 +12,7 @@ import (
 
 	driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 	"github.com/test-go/testify/assert"
 )
@@ -25,12 +26,12 @@ func TokenLocksTest(t *testing.T, cfgProvider cfgProvider) {
 		}
 		tokenTransactionDB, err := driver.NewOwnerTransaction(config, c.Name)
 		if err != nil {
-			tokenLockDB.Close()
+			utils.IgnoreError(tokenLockDB.Close)
 			t.Fatal(err)
 		}
 		t.Run(c.Name, func(xt *testing.T) {
-			defer tokenLockDB.Close()
-			defer tokenTransactionDB.Close()
+			defer utils.IgnoreError(tokenLockDB.Close)
+			defer utils.IgnoreError(tokenTransactionDB.Close)
 			c.Fn(xt, tokenLockDB, tokenTransactionDB)
 		})
 	}
 
@@ -16,6 +16,7 @@ import (
 	tdriver "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/common"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 	"github.com/test-go/testify/assert"
 )
@@ -30,7 +31,9 @@ func TokensTest(t *testing.T, cfgProvider cfgProvider) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			defer db.(*common.TokenDB).Close()
+			tokenDB, ok := db.(*common.TokenDB)
+			assert.True(xt, ok)
+			defer utils.IgnoreError(tokenDB.Close)
 			c.Fn(xt, db.(*common.TokenDB))
 		})
 	}
 
@@ -19,6 +19,7 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token"
 	driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"
 	"github.com/test-go/testify/assert"
 )
 
@@ -30,7 +31,7 @@ func TransactionsTest(t *testing.T, cfgProvider cfgProvider) {
 			t.Fatal(err)
 		}
 		t.Run(c.Name, func(xt *testing.T) {
-			defer db.Close()
+			defer utils.IgnoreError(db.Close)
 			c.Fn(xt, db)
 		})
 	}
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"`
`16`	`16`	`postgres2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/postgres"`
`17`	`17`	`"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"`
`18`		`- . "github.com/onsi/gomega"`
	`18`	`+ "github.com/onsi/gomega"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`type ReplicationOpts interface {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"`
`14`	`14`	`"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"`
	`15`	`+ "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"`
`15`	`16`	`"github.com/hyperledger-labs/fabric-token-sdk/token/token"`
`16`	`17`	`"github.com/test-go/testify/assert"`
`17`	`18`	`)`
`@@ -25,12 +26,12 @@ func TokenLocksTest(t *testing.T, cfgProvider cfgProvider) {`
`25`	`26`	`}`
`26`	`27`	`tokenTransactionDB, err := driver.NewOwnerTransaction(config, c.Name)`
`27`	`28`	`if err != nil {`
`28`		`- tokenLockDB.Close()`
	`29`	`+ utils.IgnoreError(tokenLockDB.Close)`
`29`	`30`	`t.Fatal(err)`
`30`	`31`	`}`
`31`	`32`	`t.Run(c.Name, func(xt *testing.T) {`
`32`		`- defer tokenLockDB.Close()`
`33`		`- defer tokenTransactionDB.Close()`
	`33`	`+ defer utils.IgnoreError(tokenLockDB.Close)`
	`34`	`+ defer utils.IgnoreError(tokenTransactionDB.Close)`
`34`	`35`	`c.Fn(xt, tokenLockDB, tokenTransactionDB)`
`35`	`36`	`})`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`tdriver "github.com/hyperledger-labs/fabric-token-sdk/token/driver"`
`17`	`17`	`"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"`
`18`	`18`	`"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/common"`
	`19`	`+ "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"`
`19`	`20`	`"github.com/hyperledger-labs/fabric-token-sdk/token/token"`
`20`	`21`	`"github.com/test-go/testify/assert"`
`21`	`22`	`)`
`@@ -30,7 +31,9 @@ func TokensTest(t *testing.T, cfgProvider cfgProvider) {`
`30`	`31`	`if err != nil {`
`31`	`32`	`t.Fatal(err)`
`32`	`33`	`}`
`33`		`- defer db.(*common.TokenDB).Close()`
	`34`	`+ tokenDB, ok := db.(*common.TokenDB)`
	`35`	`+ assert.True(xt, ok)`
	`36`	`+ defer utils.IgnoreError(tokenDB.Close)`
`34`	`37`	`c.Fn(xt, db.(*common.TokenDB))`
`35`	`38`	`})`
`36`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`"github.com/hyperledger-labs/fabric-token-sdk/token"`
`20`	`20`	`driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"`
`21`	`21`	`"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"`
	`22`	`+ "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"`
`22`	`23`	`"github.com/test-go/testify/assert"`
`23`	`24`	`)`
`24`	`25`
`@@ -30,7 +31,7 @@ func TransactionsTest(t *testing.T, cfgProvider cfgProvider) {`
`30`	`31`	`t.Fatal(err)`
`31`	`32`	`}`
`32`	`33`	`t.Run(c.Name, func(xt *testing.T) {`
`33`		`- defer db.Close()`
	`34`	`+ defer utils.IgnoreError(db.Close)`
`34`	`35`	`c.Fn(xt, db)`
`35`	`36`	`})`
`36`	`37`	`}`