Skip to content

Commit

Permalink
remove uploadedAt from manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
dryajov committed Jan 29, 2025
1 parent 58a962a commit fdd02a8
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 35 deletions.
11 changes: 0 additions & 11 deletions codex/manifest/coders.nim
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ proc encode*(manifest: Manifest): ?!seq[byte] =
# optional ErasureInfo erasure = 7; # erasure coding info
# optional filename: ?string = 8; # original filename
# optional mimetype: ?string = 9; # original mimetype
# optional uploadedAt: ?int64 = 10; # original uploadedAt
# }
# ```
#
Expand Down Expand Up @@ -102,9 +101,6 @@ proc encode*(manifest: Manifest): ?!seq[byte] =
if manifest.mimetype.isSome:
header.write(9, manifest.mimetype.get())

if manifest.uploadedAt.isSome:
header.write(10, manifest.uploadedAt.get().uint64)

pbNode.write(1, header) # set the treeCid as the data field
pbNode.finish()

Expand Down Expand Up @@ -135,7 +131,6 @@ proc decode*(_: type Manifest, data: openArray[byte]): ?!Manifest =
verifiableStrategy: uint32
filename: string
mimetype: string
uploadedAt: uint64

# Decode `Header` message
if pbNode.getField(1, pbHeader).isErr:
Expand Down Expand Up @@ -169,9 +164,6 @@ proc decode*(_: type Manifest, data: openArray[byte]): ?!Manifest =
if pbHeader.getField(9, mimetype).isErr:
return failure("Unable to decode `mimetype` from manifest!")

if pbHeader.getField(10, uploadedAt).isErr:
return failure("Unable to decode `uploadedAt` from manifest!")

let protected = pbErasureInfo.buffer.len > 0
var verifiable = false
if protected:
Expand Down Expand Up @@ -211,7 +203,6 @@ proc decode*(_: type Manifest, data: openArray[byte]): ?!Manifest =

var filenameOption = if filename.len == 0: string.none else: filename.some
var mimetypeOption = if mimetype.len == 0: string.none else: mimetype.some
var uploadedAtOption = if uploadedAt == 0: int64.none else: uploadedAt.int64.some

let self =
if protected:
Expand All @@ -229,7 +220,6 @@ proc decode*(_: type Manifest, data: openArray[byte]): ?!Manifest =
strategy = StrategyType(protectedStrategy),
filename = filenameOption,
mimetype = mimetypeOption,
uploadedAt = uploadedAtOption,
)
else:
Manifest.new(
Expand All @@ -241,7 +231,6 @@ proc decode*(_: type Manifest, data: openArray[byte]): ?!Manifest =
codec = codec.MultiCodec,
filename = filenameOption,
mimetype = mimetypeOption,
uploadedAt = uploadedAtOption,
)

?self.verify()
Expand Down
15 changes: 1 addition & 14 deletions codex/manifest/manifest.nim
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ type Manifest* = ref object of RootObj
version: CidVersion # Cid version
filename {.serialize.}: ?string # The filename of the content uploaded (optional)
mimetype {.serialize.}: ?string # The mimetype of the content uploaded (optional)
uploadedAt {.serialize.}: ?int64 # The UTC creation timestamp in seconds
case protected {.serialize.}: bool # Protected datasets have erasure coded info
of true:
ecK: int # Number of blocks to encode
Expand Down Expand Up @@ -131,8 +130,6 @@ func filename*(self: Manifest): ?string =
func mimetype*(self: Manifest): ?string =
self.mimetype

func uploadedAt*(self: Manifest): ?int64 =
self.uploadedAt
############################################################
# Operations on block list
############################################################
Expand Down Expand Up @@ -172,7 +169,7 @@ func `==`*(a, b: Manifest): bool =
(a.treeCid == b.treeCid) and (a.datasetSize == b.datasetSize) and
(a.blockSize == b.blockSize) and (a.version == b.version) and (a.hcodec == b.hcodec) and
(a.codec == b.codec) and (a.protected == b.protected) and (a.filename == b.filename) and
(a.mimetype == b.mimetype) and (a.uploadedAt == b.uploadedAt) and (
(a.mimetype == b.mimetype) and (
if a.protected:
(a.ecK == b.ecK) and (a.ecM == b.ecM) and (a.originalTreeCid == b.originalTreeCid) and
(a.originalDatasetSize == b.originalDatasetSize) and
Expand Down Expand Up @@ -202,9 +199,6 @@ func `$`*(self: Manifest): string =
if self.mimetype.isSome:
result &= ", mimetype: " & $self.mimetype

if self.uploadedAt.isSome:
result &= ", uploadedAt: " & $self.uploadedAt

result &= (
if self.protected:
", ecK: " & $self.ecK & ", ecM: " & $self.ecM & ", originalTreeCid: " &
Expand Down Expand Up @@ -236,7 +230,6 @@ func new*(
protected = false,
filename: ?string = string.none,
mimetype: ?string = string.none,
uploadedAt: ?int64 = int64.none,
): Manifest =
T(
treeCid: treeCid,
Expand All @@ -248,7 +241,6 @@ func new*(
protected: protected,
filename: filename,
mimetype: mimetype,
uploadedAt: uploadedAt,
)

func new*(
Expand Down Expand Up @@ -278,7 +270,6 @@ func new*(
protectedStrategy: strategy,
filename: manifest.filename,
mimetype: manifest.mimetype,
uploadedAt: manifest.uploadedAt,
)

func new*(T: type Manifest, manifest: Manifest): Manifest =
Expand All @@ -296,7 +287,6 @@ func new*(T: type Manifest, manifest: Manifest): Manifest =
protected: false,
filename: manifest.filename,
mimetype: manifest.mimetype,
uploadedAt: manifest.uploadedAt,
)

func new*(
Expand All @@ -314,7 +304,6 @@ func new*(
strategy = SteppedStrategy,
filename: ?string = string.none,
mimetype: ?string = string.none,
uploadedAt: ?int64 = int64.none,
): Manifest =
Manifest(
treeCid: treeCid,
Expand All @@ -331,7 +320,6 @@ func new*(
protectedStrategy: strategy,
filename: filename,
mimetype: mimetype,
uploadedAt: uploadedAt,
)

func new*(
Expand Down Expand Up @@ -374,7 +362,6 @@ func new*(
verifiableStrategy: strategy,
filename: manifest.filename,
mimetype: manifest.mimetype,
uploadedAt: manifest.uploadedAt,
)

func new*(T: type Manifest, data: openArray[byte]): ?!Manifest =
Expand Down
1 change: 0 additions & 1 deletion codex/node.nim
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ proc store*(
codec = dataCodec,
filename = filename,
mimetype = mimetype,
uploadedAt = now().utc.toTime.toUnix.some,
)

without manifestBlk =? await self.storeManifest(manifest), err:
Expand Down
2 changes: 1 addition & 1 deletion codex/slots/builder/builder.nim
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ proc getCellHashes*[T, H](
blkIdx = blkIdx
pos = i

trace "Getting block CID for tree at index"
trace "Getting block CID for tree at index", index = blkIdx
without (_, tree) =? (await self.buildBlockTree(blkIdx, i)) and digest =? tree.root,
err:
error "Failed to get block CID for tree at index", err = err.msg
Expand Down
6 changes: 0 additions & 6 deletions openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -371,12 +371,6 @@ components:
nullable: true
description: "The original mimetype of the uploaded content (optional)"
example: image/png
uploadedAt:
type: integer
format: int64
nullable: true
description: "The UTC upload timestamp in seconds"
example: 1729244192

Space:
type: object
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/testrestapi.nim
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@ twonodessuite "REST API":
check manifest["filename"].getStr() == "example.txt"
check manifest.hasKey("mimetype") == true
check manifest["mimetype"].getStr() == "text/plain"
check manifest.hasKey("uploadedAt") == true
check manifest["uploadedAt"].getInt() > 0

test "node set the headers when for download", twoNodesConfig:
let headers = newHttpHeaders(
Expand Down

0 comments on commit fdd02a8

Please sign in to comment.