Merge remote-tracking branch 'upstream/master' into burned

ordinals · Oct 10, 2023 · eb56fb8 · eb56fb8
2 parents 143e8b1 + b456340
commit eb56fb8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/src/runes.rs b/src/runes.rs
@@ -1073,17 +1073,17 @@ mod tests {
       [
         (
           OutPoint {
-            txid: txid1,
+            txid: txid0,
             vout: 0
           },
-          vec![(id1, u128::max_value())]
+          vec![(id0, u128::max_value())]
         ),
         (
           OutPoint {
-            txid: txid0,
+            txid: txid1,
             vout: 0
           },
-          vec![(id0, u128::max_value())]
+          vec![(id1, u128::max_value())]
         ),
       ]
     );
@@ -1249,17 +1249,17 @@ mod tests {
       [
         (
           OutPoint {
-            txid: txid1,
+            txid: txid0,
             vout: 0
           },
-          vec![(id1, u128::max_value())]
+          vec![(id0, u128::max_value())]
         ),
         (
           OutPoint {
-            txid: txid0,
+            txid: txid1,
             vout: 0
           },
-          vec![(id0, u128::max_value())]
+          vec![(id1, u128::max_value())]
         ),
       ]
     );
@@ -1500,18 +1500,18 @@ mod tests {
       [
         (
           OutPoint {
-            txid: txid1,
+            txid: txid0,
             vout: 0
           },
-          vec![(id1, u128::max_value())]
+          vec![(id0, u128::max_value())]
         ),
         (
           OutPoint {
-            txid: txid0,
+            txid: txid1,
             vout: 0
           },
-          vec![(id0, u128::max_value())]
-        )
+          vec![(id1, u128::max_value())]
+        ),
       ]
     );
 
@@ -1754,17 +1754,17 @@ mod tests {
       [
         (
           OutPoint {
-            txid: txid1,
+            txid: txid0,
             vout: 0
           },
-          vec![(id1, u128::max_value())]
+          vec![(id0, u128::max_value())]
         ),
         (
           OutPoint {
-            txid: txid0,
+            txid: txid1,
             vout: 0
           },
-          vec![(id0, u128::max_value())]
+          vec![(id1, u128::max_value())]
         ),
       ]
     );
@@ -1984,18 +1984,18 @@ mod tests {
       [
         (
           OutPoint {
-            txid: txid1,
+            txid: txid0,
             vout: 0
           },
-          vec![(id1, u128::max_value())]
+          vec![(id0, u128::max_value())]
         ),
         (
           OutPoint {
-            txid: txid0,
+            txid: txid1,
             vout: 0
           },
-          vec![(id0, u128::max_value())]
-        )
+          vec![(id1, u128::max_value())]
+        ),
       ]
     );
 

diff --git a/src/runes/runestone.rs b/src/runes/runestone.rs
@@ -64,7 +64,10 @@ impl Runestone {
 
     if let Some(etching) = self.etching {
       varint::encode_to_vec(etching.rune.0, &mut payload);
-      varint::encode_to_vec(etching.divisibility.into(), &mut payload);
+
+      if etching.divisibility != 0 {
+        varint::encode_to_vec(etching.divisibility.into(), &mut payload);
+      }
     }
 
     let mut builder = script::Builder::new()