Upgrade to twox-hash 2.0

Author: shepmaster

Cargo.lock

@@ -75,7 +75,7 @@ sha3 = { version = "0.10.8", default-features = false }
 siphasher = { version = "1.0.1", default-features = false }
 slab = { version = "0.4.8", default-features = false }
 smallvec = { version = "1.13.2", default-features = false }
-twox-hash = { version = "1.6.3", default-features = false }
+twox-hash = { version = "2.0.0", default-features = false, features = ["xxhash64"] }
 wasmi = { version = "0.38.0", default-features = false }
 x25519-dalek = { version = "2.0.0-rc.3", default-features = false, features = ["alloc", "precomputed-tables", "static_secrets", "zeroize"] }
 zeroize = { version = "1.7.0", default-features = false, features = ["alloc"] }

lib/Cargo.toml

@@ -1794,50 +1794,41 @@ impl ReadyToRun {
                     .alloc_write_and_return_pointer(host_fn.name(), iter::once(out.as_bytes()))
             }
             HostFunction::ext_hashing_twox_64_version_1 => {
-                let mut h0 = twox_hash::XxHash::with_seed(0);
+                let r0 =
                 {
                     let data = expect_pointer_size!(0);
-                    h0.write(data.as_ref());
-                }
-                let r0 = h0.finish();
+                    twox_hash::XxHash64::oneshot(0, data.as_ref())
+                };
 
                 self.inner
                     .alloc_write_and_return_pointer(host_fn.name(), iter::once(&r0.to_le_bytes()))
             }
             HostFunction::ext_hashing_twox_128_version_1 => {
-                let mut h0 = twox_hash::XxHash::with_seed(0);
-                let mut h1 = twox_hash::XxHash::with_seed(1);
-                {
+                let [r0, r1] = {
                     let data = expect_pointer_size!(0);
                     let data = data.as_ref();
-                    h0.write(data);
-                    h1.write(data);
-                }
-                let r0 = h0.finish();
-                let r1 = h1.finish();
+                    [
+                        twox_hash::XxHash64::oneshot(0, data),
+                        twox_hash::XxHash64::oneshot(1, data),
+                    ]
+                };
 
                 self.inner.alloc_write_and_return_pointer(
                     host_fn.name(),
                     iter::once(&r0.to_le_bytes()).chain(iter::once(&r1.to_le_bytes())),
                 )
             }
             HostFunction::ext_hashing_twox_256_version_1 => {
-                let mut h0 = twox_hash::XxHash::with_seed(0);
-                let mut h1 = twox_hash::XxHash::with_seed(1);
-                let mut h2 = twox_hash::XxHash::with_seed(2);
-                let mut h3 = twox_hash::XxHash::with_seed(3);
-                {
+                let [r0, r1, r2, r3] = {
                     let data = expect_pointer_size!(0);
                     let data = data.as_ref();
-                    h0.write(data);
-                    h1.write(data);
-                    h2.write(data);
-                    h3.write(data);
-                }
-                let r0 = h0.finish();
-                let r1 = h1.finish();
-                let r2 = h2.finish();
-                let r3 = h3.finish();
+                    [
+                        twox_hash::XxHash64::oneshot(0, data),
+                        twox_hash::XxHash64::oneshot(1, data),
+                        twox_hash::XxHash64::oneshot(2, data),
+                        twox_hash::XxHash64::oneshot(3, data),
+                    ]
+                };
 
                 self.inner.alloc_write_and_return_pointer(
                     host_fn.name(),