diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5135c9ca6..7c576e483 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -25,7 +25,7 @@ jobs: AS_DEPENDENCY: true DO_NO_STD: true DO_DOCS: true - - rust: 1.41.1 + - rust: 1.65.0 env: AS_DEPENDENCY: true steps: @@ -41,27 +41,6 @@ jobs: env: ${{ matrix.env }} run: ./contrib/test.sh - Arch32bit: - name: Testing 32-bit version - runs-on: ubuntu-latest - steps: - - name: Checkout Crate - uses: actions/checkout@v2 - - name: Checkout Toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - name: Add architecture i386 - run: sudo dpkg --add-architecture i386 - - name: Install i686 gcc - run: sudo apt-get update -y && sudo apt-get install -y gcc-multilib - - name: Install target - run: rustup target add i686-unknown-linux-gnu - - name: Run test on i686 - run: cargo test --target i686-unknown-linux-gnu - Cross: name: Cross testing if: ${{ !github.event.act }} diff --git a/src/ephemerealdata/instant_lock.rs b/src/ephemerealdata/instant_lock.rs index 474caade7..652100b16 100644 --- a/src/ephemerealdata/instant_lock.rs +++ b/src/ephemerealdata/instant_lock.rs @@ -14,6 +14,10 @@ use blockdata::transaction::outpoint::OutPoint; //#[cfg(feature = "use-serde")] //use serde_big_array::BigArray; +type BlsSignature = [u8; 96]; + +type CycleHash = [u8; 32]; + #[derive(Clone, Eq, PartialEq)] // #[cfg_attr(feature = "use-serde", derive(Serialize, Deserialize))] /// Instant send lock is a mechanism used by the Dash network to @@ -27,11 +31,11 @@ pub struct InstantLock { /// Transaction hash locked by this lock pub txid: Txid, /// Hash to figure out which quorum was used to sign this IS lock - pub cyclehash: [u8; 32], + pub cyclehash: CycleHash, /// Quorum signature for this IS lock //#[cfg_attr(feature = "use-serde", serde(serialize_with = "<[_]>::serialize"))] //#[cfg_attr(feature = "use-serde", serde(with = "BigArray"))] - pub signature: [u8; 96], + pub signature: BlsSignature, } impl Default for InstantLock {