fixup no decodes

mit-pdos · Jun 10, 2024 · 117bfde · 117bfde
1 parent fc9e472
commit 117bfde
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/ktmerkle/rpc.go b/ktmerkle/rpc.go
@@ -13,19 +13,19 @@ type epochHash struct {
 }
 
 // rpc: no decode needed.
-type putArg struct {
-	// rpc: invariant: len 32.
-	id  merkle.Id
-	val merkle.Val
-}
-
 type idValEpoch struct {
 	// rpc: invariant: len 32.
 	id    merkle.Id
 	val   merkle.Val
 	epoch epochTy
 }
 
+type putArg struct {
+	// rpc: invariant: len 32.
+	id  merkle.Id
+	val merkle.Val
+}
+
 type putReply struct {
 	epoch epochTy
 	// rpc: invariant: len 64.

diff --git a/ktmerkle/rpc.out.go b/ktmerkle/rpc.out.go
@@ -13,20 +13,20 @@ func (o *epochHash) encode() []byte {
 	b = marshal.WriteBytes(b, o.hash)
 	return b
 }
-func (o *putArg) encode() []byte {
+func (o *idValEpoch) encode() []byte {
 	var b = make([]byte, 0)
 	b = marshal.WriteBytes(b, o.id)
 	b = marshalutil.WriteSlice1D(b, o.val)
+	b = marshal.WriteInt(b, o.epoch)
 	return b
 }
-func (o *idValEpoch) encode() []byte {
+func (o *putArg) encode() []byte {
 	var b = make([]byte, 0)
 	b = marshal.WriteBytes(b, o.id)
 	b = marshalutil.WriteSlice1D(b, o.val)
-	b = marshal.WriteInt(b, o.epoch)
 	return b
 }
-func (o *idValEpoch) decode(b0 []byte) ([]byte, errorTy) {
+func (o *putArg) decode(b0 []byte) ([]byte, errorTy) {
 	var b = b0
 	id, b, err := marshalutil.SafeReadBytes(b, 32)
 	if err {
@@ -36,13 +36,8 @@ func (o *idValEpoch) decode(b0 []byte) ([]byte, errorTy) {
 	if err {
 		return nil, err
 	}
-	epoch, b, err := marshalutil.SafeReadInt(b)
-	if err {
-		return nil, err
-	}
 	o.id = id
 	o.val = val
-	o.epoch = epoch
 	return b, errNone
 }
 func (o *putReply) encode() []byte {