applied suggested changes

Author: fforbeck

src/core/server/tools/retrieve.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 import { StorachaClient } from '../../storage/client.js';
 import { StorageConfig } from 'src/core/storage/types.js';
-import { isValidCID } from 'src/core/storage/utils.js';
 
 type RetrieveInput = {
   filepath: string;

test/integration/stdio-mcp-server.test.ts

@@ -115,7 +115,6 @@ const isCI = process.env.CI === 'true';
     // Parse upload response
     const uploadResult = JSON.parse(uploadContent.text);
     expect(uploadResult).toHaveProperty('root');
-<<<<<<< HEAD
     // The root can be either a string or an object with toString method
     expect(uploadResult.root).toBeDefined();
     expect(uploadResult).toHaveProperty('url');
@@ -132,16 +131,14 @@ const isCI = process.env.CI === 'true';
     // Check the first file entry (could be in different formats depending on serialization)
     const firstFile = fileEntries[0];
     expect(firstFile).toBeDefined();
-=======
-    expect(typeof uploadResult.root).toBe('string');
+    // The root can be either a string or an object with toString method
+    expect(uploadResult.root).toBeDefined();
     expect(uploadResult).toHaveProperty('url');
     expect(uploadResult).toHaveProperty('files');
-    expect(Array.isArray(uploadResult.files)).toBe(true);
-    expect(uploadResult.files.length).toBeGreaterThan(0);
-    expect(uploadResult.files[0]).toHaveProperty('name');
-    expect(uploadResult.files[0]).toHaveProperty('url');
-    expect(uploadResult.files[0]).toHaveProperty('cid');
->>>>>>> 8ed405d (feat: preserve filename using uploadDirectory)
+
+    // Test that files is an object with at least one entry
+    expect(typeof uploadResult.files).toBe('object');
+    expect(uploadResult.files).not.toBeNull();
   }, 30_000); // Increase the timeout for upload test
 
   it('should retrieve a file', async () => {

test/unit/core/server/tools/retrieve.test.ts

@@ -5,14 +5,6 @@ import { Signer } from '@ucanto/principal/ed25519';
 import { Delegation, Capabilities } from '@ucanto/interface';
 import { StorachaClient } from '../../../../../src/core/storage/client.js';
 
-// // Mock isValidCID function from the utils.js file
-// vi.mock('../../../../../src/core/storage/utils.js', () => ({
-//   isValidCID: vi.fn().mockImplementation((cid) => {
-//     // Simple mock that considers any non-empty string a valid CID
-//     return typeof cid === 'string' && cid.trim().length > 0;
-//   }),
-// }));
-
 // Create mocks
 const mockSigner = {
   did: () => 'did:key:mock',