Merge pull request #455 from Concordium/rust-sdk-6

Update rust sdk to support P8

Author: limemloh

.github/workflows/linter.yml

@@ -64,11 +64,9 @@ jobs:
           submodules: recursive
 
       - name: Install nightly toolchain with rustfmt available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_FMT }}
-          override: true
           components: rustfmt
 
       - name: Run cargo fmt
@@ -95,11 +93,9 @@ jobs:
           submodules: recursive
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
-          override: true
 
       - name: Run cargo doc
         working-directory: ${{ matrix.crates }}
@@ -118,12 +114,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ env.RUST_VERSION }}
-
-      - name: Install Wasm target
-        run: rustup target install wasm32-unknown-unknown
+          target: wasm32-unknown-unknown
 
       - name: Run internal wasm unit test
         working-directory: concordium-std
@@ -157,12 +151,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain with clippy available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
           components: clippy
 
       - name: Run cargo clippy
@@ -197,12 +189,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain with clippy available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
           components: clippy
 
       - name: Run cargo clippy
@@ -234,12 +224,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain with clippy available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
           components: clippy
 
       - name: Run cargo clippy
@@ -273,12 +261,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain with clippy available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
           components: clippy
 
       - name: Run cargo clippy, but only for wasm32 target
@@ -298,12 +284,10 @@ jobs:
           submodules: recursive
 
       - name: Install nightly toolchain with check available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: nightly
           target: wasm32-unknown-unknown
-          override: true
 
       - name: Run no-std build concordium-std
         working-directory: concordium-std
@@ -345,12 +329,10 @@ jobs:
           submodules: recursive
 
       - name: Install nightly toolchain with check available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: nightly
           target: ${{ matrix.target }}
-          override: true
 
       - name: Run cargo check with no-std
         uses: actions-rs/cargo@v1
@@ -381,12 +363,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
 
       - name: Run cargo build with crypto-primitives feature
         uses: actions-rs/cargo@v1
@@ -441,12 +421,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain with clippy available
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
           components: clippy
 
       - name: Run cargo clippy with schema and tests
@@ -478,12 +456,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1
@@ -514,12 +490,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
-          override: true
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1
@@ -534,9 +508,6 @@ jobs:
     needs: [rustfmt, clippy-schema]
     strategy:
       matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-
         crates:
           - examples/voting
           - examples/eSealing
@@ -575,15 +546,10 @@ jobs:
           submodules: recursive
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ env.RUST_VERSION_TESTING_LIBRARY }}
-          target: ${{ matrix.target }}
-          override: true
-
-      - name: Install Wasm target
-        run: rustup target install wasm32-unknown-unknown
+          target: wasm32-unknown-unknown
 
       - name: Download and install Cargo Concordium
         run: |

concordium-rust-sdk

@@ -393,7 +393,7 @@
 //! [test_infrastructure]: ./test_infrastructure/index.html
 //! [concordium_smart_contract_testing]: https://docs.rs/concordium-smart-contract-testing
 
-#![cfg_attr(not(feature = "std"), no_std, feature(core_intrinsics))]
+#![cfg_attr(not(feature = "std"), no_std, allow(internal_features), feature(core_intrinsics))]
 
 #[cfg(not(feature = "std"))]
 pub extern crate alloc;

concordium-std/src/lib.rs

@@ -1926,147 +1926,3 @@ pub fn concordium_qc<A: Testable>(num_tests: u64, f: A) {
 pub fn concordium_qc<A: Testable>(num_tests: u64, f: A) {
     QuickCheck::new().tests(num_tests).max_tests(QUICKCHECK_MAX_WITH_DISCARDED_TESTS).quickcheck(f)
 }
-
-#[cfg(test)]
-#[allow(deprecated)]
-mod test {
-    use crate::{cell::RefCell, rc::Rc, test_infrastructure::TestStateEntry, HasStateEntry};
-    use concordium_contracts_common::{Read, Seek, SeekFrom, Write};
-
-    #[test]
-    fn test_testhost_balance_queries_reflect_transfers() {
-        use super::*;
-        let mut host = TestHost::new((), TestStateBuilder::new());
-
-        let self_address = ContractAddress::new(0, 0);
-        host.set_self_address(self_address);
-        host.set_self_balance(Amount::from_micro_ccd(3000));
-
-        let account = AccountAddress([0; 32]);
-        let account_balance =
-            AccountBalance::new(Amount::zero(), Amount::zero(), Amount::zero()).unwrap();
-        host.setup_query_account_balance(account, account_balance);
-
-        host.invoke_transfer(&account, Amount::from_micro_ccd(2000))
-            .expect("Transferring should succeed");
-
-        let account_new_balance = host.account_balance(account).expect("Should succeed");
-        let self_new_balance = host.contract_balance(self_address).expect("Should succeed");
-
-        assert_eq!(account_new_balance.total, Amount::from_micro_ccd(2000));
-        assert_eq!(self_new_balance, Amount::from_micro_ccd(1000));
-    }
-
-    #[test]
-    fn test_testhost_balance_queries_reflect_invoke() {
-        use super::*;
-        let mut host = TestHost::new((), TestStateBuilder::new());
-
-        let self_address = ContractAddress::new(0, 0);
-        host.set_self_address(self_address);
-        host.set_self_balance(Amount::from_micro_ccd(3000));
-
-        let other_address = ContractAddress::new(1, 0);
-        host.setup_query_contract_balance(other_address, Amount::from_micro_ccd(4000));
-
-        let entrypoint = OwnedEntrypointName::new_unchecked("test.method".to_string());
-
-        host.setup_mock_entrypoint(other_address, entrypoint.clone(), MockFn::returning_ok(()));
-
-        host.invoke_contract_raw(
-            &other_address,
-            Parameter::empty(),
-            entrypoint.as_entrypoint_name(),
-            Amount::from_micro_ccd(1000),
-        )
-        .expect("Invoke should succeed");
-
-        let other_new_balance = host.contract_balance(other_address).expect("Should succeed");
-        let self_new_balance = host.contract_balance(self_address).expect("Should succeed");
-
-        assert_eq!(other_new_balance, Amount::from_micro_ccd(5000));
-        assert_eq!(self_new_balance, Amount::from_micro_ccd(2000));
-    }
-
-    #[test]
-    // Perform a number of operations from Seek, Read, Write and HasStateApi
-    // classes on the TestStateApi structure and check that they behave as
-    // specified.
-    fn test_contract_state() {
-        let data = Rc::new(RefCell::new(vec![1; 100].into()));
-        let mut state = TestStateEntry::open(data, Vec::new(), 0);
-        assert_eq!(state.seek(SeekFrom::Start(100)), Ok(100), "Seeking to the end failed.");
-        assert_eq!(
-            state.seek(SeekFrom::Current(0)),
-            Ok(100),
-            "Seeking from current position with offset 0 failed."
-        );
-        assert!(
-            state.seek(SeekFrom::Current(1)).is_err(),
-            "Seeking from current position with offset 1 succeeded."
-        );
-        assert_eq!(state.cursor.offset, 100, "Cursor position changed on failed seek.");
-        assert_eq!(
-            state.seek(SeekFrom::Current(-1)),
-            Ok(99),
-            "Seeking from current position backwards with offset 1 failed."
-        );
-        assert!(state.seek(SeekFrom::Current(-100)).is_err(), "Seeking beyond beginning succeeds");
-        assert_eq!(state.seek(SeekFrom::Current(-99)), Ok(0), "Seeking to the beginning fails.");
-        assert_eq!(state.seek(SeekFrom::End(0)), Ok(100), "Seeking from end fails.");
-        assert!(
-            state.seek(SeekFrom::End(1)).is_err(),
-            "Seeking beyond the end succeeds but should fail."
-        );
-        assert_eq!(state.cursor.offset, 100, "Cursor position changed on failed seek.");
-        assert_eq!(
-            state.seek(SeekFrom::End(-20)),
-            Ok(80),
-            "Seeking from end leads to incorrect position."
-        );
-        assert_eq!(state.write(&[0; 21]), Ok(21), "Writing writes an incorrect amount of data.");
-        assert_eq!(state.cursor.offset, 101, "After writing the cursor is at the end.");
-        assert_eq!(state.write(&[0; 21]), Ok(21), "Writing again writes incorrect amount of data.");
-        let mut buf = [0; 30];
-        assert_eq!(state.read(&mut buf), Ok(0), "Reading from the end should read 0 bytes.");
-        assert_eq!(state.seek(SeekFrom::End(-20)), Ok(102));
-        assert_eq!(state.read(&mut buf), Ok(20), "Reading from offset 80 should read 20 bytes.");
-        assert_eq!(
-            &buf[0..20],
-            &state.cursor.data.borrow().data().expect("Entry was deleted")[80..100],
-            "Incorrect data was read."
-        );
-        assert_eq!(
-            state.cursor.offset, 122,
-            "After reading the offset is in the correct position."
-        );
-        assert!(state.reserve(222).is_ok(), "Could not increase state to 222.");
-        assert_eq!(state.write(&[2; 100]), Ok(100), "Should have written 100 bytes.");
-        assert_eq!(state.cursor.offset, 222, "After writing the offset should be 200.");
-        state.truncate(50).expect("Could not truncate state to 50.");
-        assert_eq!(state.cursor.offset, 50, "After truncation the state should be 50.");
-        assert_eq!(
-            state.write(&[1; 1000]),
-            Ok(1000),
-            "Writing at the end after truncation should succeed."
-        );
-    }
-
-    #[test]
-    fn test_contract_state_write() {
-        let data = Rc::new(RefCell::new(vec![0u8; 10].into()));
-        let mut state = TestStateEntry::open(data, Vec::new(), 0);
-        assert_eq!(state.write(&1u64.to_le_bytes()), Ok(8), "Incorrect number of bytes written.");
-        assert_eq!(
-            state.write(&2u64.to_le_bytes()),
-            Ok(8),
-            "State should be resized automatically."
-        );
-        assert_eq!(state.cursor.offset, 16, "Pos should be at the end.");
-        assert_eq!(
-            *state.cursor.data.as_ref().borrow().data().expect("Entry was deleted"),
-            vec![1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0],
-            "Correct data was written."
-        );
-    }
-}