Merge pull request #1484 from 0chain/fix/unit-tests

Fix blobber unit tests

Author: Jayashsatolia403

code/go/0chain.net/blobbercore/allocation/copyfilechange_test.go

@@ -38,7 +38,7 @@ func TestBlobberCore_CopyFile(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 
 	testCases := []struct {
 		name                string

code/go/0chain.net/blobbercore/allocation/deletefilechange_test.go

@@ -32,7 +32,7 @@ func TestBlobberCore_DeleteFile(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 	testCases := []struct {
 		name                string
 		context             metadata.MD

code/go/0chain.net/blobbercore/allocation/file_changer_upload_test.go

@@ -39,7 +39,7 @@ func TestBlobberCore_FileChangerUpload(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 
 	testCases := []struct {
 		name                string

code/go/0chain.net/blobbercore/allocation/movefilechange_test.go

@@ -37,7 +37,7 @@ func TestBlobberCore_MoveFile(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 
 	testCases := []struct {
 		name                string

code/go/0chain.net/blobbercore/allocation/multiop_test.go

@@ -30,7 +30,7 @@ func TestMultiOp(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 	datastore.MocketTheStore(t, true)
 	ctx := datastore.GetStore().CreateTransaction(context.TODO())
 	setupDbMock()

code/go/0chain.net/blobbercore/allocation/renamefilechange_test.go

@@ -152,7 +152,7 @@ func TestBlobberCore_RenameFile(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 
 	testCases := []struct {
 		name            string

code/go/0chain.net/blobbercore/allocation/updatefilechange_test.go

@@ -36,7 +36,7 @@ func TestBlobberCore_UpdateFile(t *testing.T) {
 	ts := time.Now().Add(time.Hour)
 	alloc := makeTestAllocation(common.Timestamp(ts.Unix()))
 	alloc.OwnerPublicKey = sch.GetPublicKey()
-	alloc.OwnerID = client.ClientID()
+	alloc.OwnerID = client.Wallet().ClientID
 
 	testCases := []struct {
 		name            string

code/go/0chain.net/blobbercore/handler/object_operation_handler_test.go

@@ -121,7 +121,7 @@ func TestDownloadFile(t *testing.T) {
 		if p.useAuthTicket {
 			authTicket := &marker.AuthTicket{
 				AllocationID: p.inData.allocationID,
-				ClientID:     client.ClientID(),
+				ClientID:     client.Wallet().ClientID,
 				Expiration:   int64(time.Duration(now) + 10000*time.Second),
 				OwnerID:      mockOwner.ClientID,
 				Timestamp:    int64(common.Now()),
@@ -292,7 +292,7 @@ func TestDownloadFile(t *testing.T) {
 
 	setupCtx := func(p parameters) context.Context {
 		ctx := context.TODO()
-		ctx = context.WithValue(ctx, constants.ContextKeyClient, client.ClientID())
+		ctx = context.WithValue(ctx, constants.ContextKeyClient, client.Wallet().ClientID)
 		ctx = context.WithValue(ctx, constants.ContextKeyAllocation, p.inData.allocationTx)
 		ctx = context.WithValue(ctx, constants.ContextKeyClientKey, client.PublicKey())