fixup! feat: introduce UIntNode interface, used within DAG-CBOR codec

ipld · Jun 8, 2022 · 633915c · 633915c
1 parent 5585719
commit 633915c
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/codec/dagcbor/marshal.go b/codec/dagcbor/marshal.go
@@ -99,29 +99,20 @@ func marshal(n datamodel.Node, tk *tok.Token, sink shared.TokenSink, options Enc
 		_, err = sink.Step(tk)
 		return err
 	case datamodel.Kind_Int:
-		var v uint64
-		positive := true
 		if uin, ok := n.(datamodel.UintNode); ok {
-			var err error
-			v, err = uin.AsUint()
+			v, err := uin.AsUint()
 			if err != nil {
 				return err
 			}
+			tk.Type = tok.TUint
+			tk.Uint = v
 		} else {
-			i, err := n.AsInt()
+			v, err := n.AsInt()
 			if err != nil {
 				return err
 			}
-			sign := (i >> 63)
-			v = uint64((i ^ sign) - sign)
-			positive = sign == 0
-		}
-		if positive {
-			tk.Type = tok.TUint
-			tk.Uint = v
-		} else {
 			tk.Type = tok.TInt
-			tk.Int = -int64(v)
+			tk.Int = v
 		}
 		_, err := sink.Step(tk)
 		return err