GitBross Home Explore Help
Register Sign In
sol_BMCMMXZh
/
hyperledger-solang_solang
mirror of https://github.com/hyperledger-solang/solang
1
0
Fork 0
Files Issues 1 Wiki
Browse Source

Remove unnecessary .into_iter() and raw string (#1456)

These are clippies in the next rust version.

Signed-off-by: Sean Young <sean@mess.org>
Sean Young 2 years ago
parent
21b160e5b2
commit
1693d29efd
23 changed files with 223 additions and 260 deletions
Unified View Show Diff Stats
  1. 2 2
      src/bin/doc/mod.rs
  2. 1 1
      src/codegen/statements.rs
  3. 2 2
      src/sema/expression/tests.rs
  4. 1 1
      src/sema/yul/tests/expression.rs
  5. 6 9
      tests/evm.rs
  6. 2 2
      tests/polkadot_tests/abi.rs
  7. 4 4
      tests/polkadot_tests/arrays.rs
  8. 26 26
      tests/polkadot_tests/builtins.rs
  9. 32 32
      tests/polkadot_tests/calls.rs
  10. 8 8
      tests/polkadot_tests/contracts.rs
  11. 2 2
      tests/polkadot_tests/events.rs
  12. 25 59
      tests/polkadot_tests/expressions.rs
  13. 20 20
      tests/polkadot_tests/format.rs
  14. 4 4
      tests/polkadot_tests/function_types.rs
  15. 4 4
      tests/polkadot_tests/mappings.rs
  16. 4 4
      tests/polkadot_tests/modifier.rs
  17. 6 6
      tests/polkadot_tests/primitives.rs
  18. 39 39
      tests/polkadot_tests/strings.rs
  19. 20 20
      tests/polkadot_tests/structs.rs
  20. 4 4
      tests/polkadot_tests/value.rs
  21. 4 4
      tests/polkadot_tests/variables.rs
  22. 6 6
      tests/solana_tests/hash.rs
  23. 1 1
      tests/solana_tests/primitives.rs

+ 2 - 2
src/bin/doc/mod.rs
View File 

@@ -396,7 +396,7 @@ pub fn generate_docs(outdir: &OsString, files: &[ast::Namespace], verbose: bool)
 
 
 
     reg.register_template_string(
 
     reg.register_template_string(
 
         "soldoc",
 
         "soldoc",
 
-        r##"<!doctype html><head><title>soldoc</title><meta charset="utf-8"></head><body>
 
+        r#"<!doctype html><head><title>soldoc</title><meta charset="utf-8"></head><body>
 
 <h2>Contracts</h2>
 
 <h2>Contracts</h2>
 
 {{#each contracts}}
 
 {{#each contracts}}
 
 <h3>{{ty}} {{name}}</h3>
 
 <h3>{{ty}} {{name}}</h3>
 
@@ -470,7 +470,7 @@ Fields:<dl>
 
 {{#if author}}Author: {{author}}<p>{{/if}}
 
 {{#if author}}Author: {{author}}<p>{{/if}}
 
 Values: {{field}}
 
 Values: {{field}}
 
 {{/each}}
 
 {{/each}}
 
-</body></html>"##,
 
+</body></html>"#,
 
     )
 
     )
 
     .expect("template should be good");
 
     .expect("template should be good");

+ 1 - 1
src/codegen/statements.rs
View File 

@@ -891,7 +891,7 @@ fn returns(
 
     let cast_values = func
 
     let cast_values = func
 
         .returns
 
         .returns
 
         .iter()
 
         .iter()
 
-        .zip(uncast_values.into_iter())
 
+        .zip(uncast_values)
 
         .map(|(left, right)| try_load_and_cast(&right.loc(), &right, &left.ty, ns, cfg, vartab))
 
         .map(|(left, right)| try_load_and_cast(&right.loc(), &right, &left.ty, ns, cfg, vartab))
 
         .collect();
 
         .collect();

+ 2 - 2
src/sema/expression/tests.rs
View File 

@@ -6,12 +6,12 @@ use crate::sema::expression::strings::unescape;
 
 
 
 #[test]
 
 #[test]
 
 fn test_unescape() {
 
 fn test_unescape() {
 
-    let s = r#"\u00f3"#;
 
+    let s = r"\u00f3";
 
     let mut vec = Diagnostics::default();
 
     let mut vec = Diagnostics::default();
 
     let res = unescape(s, 0, 0, &mut vec);
 
     let res = unescape(s, 0, 0, &mut vec);
 
     assert!(vec.is_empty());
 
     assert!(vec.is_empty());
 
     assert_eq!(res, vec![0xc3, 0xb3]);
 
     assert_eq!(res, vec![0xc3, 0xb3]);
 
-    let s = r#"\xff"#;
 
+    let s = r"\xff";
 
     let res = unescape(s, 0, 0, &mut vec);
 
     let res = unescape(s, 0, 0, &mut vec);
 
     assert!(vec.is_empty());
 
     assert!(vec.is_empty());
 
     assert_eq!(res, vec![255]);
 
     assert_eq!(res, vec![255]);

+ 1 - 1
src/sema/yul/tests/expression.rs
View File 

@@ -273,7 +273,7 @@ fn resolve_string_literal() {
 
         StringLiteral {
 
         StringLiteral {
 
             loc,
 
             loc,
 
             unicode: false,
 
             unicode: false,
 
-            string: r#"ab\xffa\u00e0g"#.to_string(),
 
+            string: r"ab\xffa\u00e0g".to_string(),
 
         },
 
         },
 
         Some(Identifier {
 
         Some(Identifier {
 
             loc,
 
             loc,

+ 6 - 9
tests/evm.rs
View File 

@@ -46,7 +46,7 @@ fn address() {
 
 #[test]
 
 #[test]
 
 fn try_catch() {
 
 fn try_catch() {
 
     let ns = test_solidity(
 
     let ns = test_solidity(
 
-        r##"
 
+        r#"
 
         contract b {
 
         contract b {
 
             int32 x;
 
             int32 x;
 
 
 
@@ -85,7 +85,7 @@ fn try_catch() {
 
 
 
                 return state;
 
                 return state;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     assert!(!ns.diagnostics.any_errors());
 
     assert!(!ns.diagnostics.any_errors());
 
@@ -179,13 +179,10 @@ fn ethereum_solidity_tests() {
 
             .join("testdata/solidity/test/libsolidity/semanticTests"),
 
             .join("testdata/solidity/test/libsolidity/semanticTests"),
 
     )
 
     )
 
     .into_iter()
 
     .into_iter()
 
-    .chain(
 
-        WalkDir::new(
 
-            Path::new(env!("CARGO_MANIFEST_DIR"))
 
-                .join("testdata/solidity/test/libsolidity/syntaxTests"),
 
-        )
 
-        .into_iter(),
 
-    );
 
+    .chain(WalkDir::new(
 
+        Path::new(env!("CARGO_MANIFEST_DIR"))
 
+            .join("testdata/solidity/test/libsolidity/syntaxTests"),
 
+    ));
 
 
 
     let errors: usize = entries
 
     let errors: usize = entries
 
         .par_bridge()
 
         .par_bridge()

+ 2 - 2
tests/polkadot_tests/abi.rs
View File 

@@ -8,7 +8,7 @@ use std::sync::Mutex;
 
 
 
 /// Partially mimicking the ink! "mother" integration test.
 
 /// Partially mimicking the ink! "mother" integration test.
 
 static MOTHER: Lazy<Mutex<(InkProject, InkProject)>> = Lazy::new(|| {
 
 static MOTHER: Lazy<Mutex<(InkProject, InkProject)>> = Lazy::new(|| {
 
-    let src = r##"
 
+    let src = r#"
 
 import "polkadot";
 
 import "polkadot";
 
 
 
 contract Mother {
 
 contract Mother {
 
@@ -32,7 +32,7 @@ contract Mother {
 
     function echo_auction(Auction _auction) public pure returns (Auction) {
 
     function echo_auction(Auction _auction) public pure returns (Auction) {
 
         return _auction;
 
         return _auction;
 
     }
 
     }
 
-}"##;
 
+}"#;
 
 
 
     let solang_abi = load_abi(&build_wasm(src, false, false)[0].1);
 
     let solang_abi = load_abi(&build_wasm(src, false, false)[0].1);
 
     let ink_str = std::fs::read_to_string("testdata/ink/mother.json").unwrap();
 
     let ink_str = std::fs::read_to_string("testdata/ink/mother.json").unwrap();

+ 4 - 4
tests/polkadot_tests/arrays.rs
View File 

@@ -1459,7 +1459,7 @@ fn alloc_size_from_storage() {
 
 #[test]
 
 #[test]
 
 fn fixed_bytes() {
 
 fn fixed_bytes() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract Storage {
 
         contract Storage {
 
             bytes32[] data;
 
             bytes32[] data;
 
             constructor() {
 
             constructor() {
 
@@ -1470,7 +1470,7 @@ fn fixed_bytes() {
 
                 return(data[j][i]);
 
                 return(data[j][i]);
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, vec![]);
 
     runtime.constructor(0, vec![]);
 
@@ -1484,7 +1484,7 @@ fn fixed_bytes() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract Memory {
 
         contract Memory {
 
             constructor() {
 
             constructor() {
 
             }
 
             }
 
@@ -1495,7 +1495,7 @@ fn fixed_bytes() {
 
                 return(data[j][i]);
 
                 return(data[j][i]);
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, vec![]);
 
     runtime.constructor(0, vec![]);

+ 26 - 26
tests/polkadot_tests/builtins.rs
View File 

@@ -7,7 +7,7 @@ use crate::build_solidity;
 
 #[test]
 
 #[test]
 
 fn abi_decode() {
 
 fn abi_decode() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract bar {
 
         contract bar {
 
             function test() public {
 
             function test() public {
 
                 (int16 a, bool b) = abi.decode(hex"7f0001", (int16, bool));
 
                 (int16 a, bool b) = abi.decode(hex"7f0001", (int16, bool));
 
@@ -15,20 +15,20 @@ fn abi_decode() {
 
                 assert(a == 127);
 
                 assert(a == 127);
 
                 assert(b == true);
 
                 assert(b == true);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract bar {
 
         contract bar {
 
             function test() public {
 
             function test() public {
 
                 uint8 a = abi.decode(hex"40", (uint8));
 
                 uint8 a = abi.decode(hex"40", (uint8));
 
 
 
                 assert(a == 64);
 
                 assert(a == 64);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -37,7 +37,7 @@ fn abi_decode() {
 
 #[test]
 
 #[test]
 
 fn abi_encode() {
 
 fn abi_encode() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         struct s {
 
         struct s {
 
             int32 f1;
 
             int32 f1;
 
             uint8 f2;
 
             uint8 f2;
 
@@ -65,7 +65,7 @@ fn abi_encode() {
 
 
 
                 assert(abi.encode(x) == hex"ff010000f71874657374696504000500");
 
                 assert(abi.encode(x) == hex"ff010000f71874657374696504000500");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -81,7 +81,7 @@ fn abi_encode() {
 
 #[test]
 
 #[test]
 
 fn abi_encode_packed() {
 
 fn abi_encode_packed() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         struct s {
 
         struct s {
 
             int32 f1;
 
             int32 f1;
 
             uint8 f2;
 
             uint8 f2;
 
@@ -110,7 +110,7 @@ fn abi_encode_packed() {
 
 
 
                 assert(abi.encodePacked(x) == hex"ff010000f774657374696504000500");
 
                 assert(abi.encodePacked(x) == hex"ff010000f774657374696504000500");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -123,7 +123,7 @@ fn abi_encode_packed() {
 
 #[test]
 
 #[test]
 
 fn abi_encode_with_selector() {
 
 fn abi_encode_with_selector() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract bar {
 
         contract bar {
 
             function test1() public {
 
             function test1() public {
 
                 uint16 a = 0xfd01;
 
                 uint16 a = 0xfd01;
 
@@ -143,7 +143,7 @@ fn abi_encode_with_selector() {
 
 
 
                 assert(abi.encodeWithSelector(hex"01020304", arr) == hex"010203040cfefcf8");
 
                 assert(abi.encodeWithSelector(hex"01020304", arr) == hex"010203040cfefcf8");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test1", Vec::new());
 
     runtime.function("test1", Vec::new());
 
@@ -154,7 +154,7 @@ fn abi_encode_with_selector() {
 
 #[test]
 
 #[test]
 
 fn abi_encode_with_signature() {
 
 fn abi_encode_with_signature() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract bar {
 
         contract bar {
 
             string bla = "Hello, World!";
 
             string bla = "Hello, World!";
 
 
 
@@ -174,7 +174,7 @@ fn abi_encode_with_signature() {
 
 
 
                 assert(abi.encodeWithSelector(hex"01020304", arr) == hex"010203040cfefcf8");
 
                 assert(abi.encodeWithSelector(hex"01020304", arr) == hex"010203040cfefcf8");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -185,7 +185,7 @@ fn abi_encode_with_signature() {
 
 #[test]
 
 #[test]
 
 fn call() {
 
 fn call() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract superior {
 
         contract superior {
 
             function test1() public {
 
             function test1() public {
 
                 inferior i = new inferior();
 
                 inferior i = new inferior();
 
@@ -228,7 +228,7 @@ fn call() {
 
             function test2(uint64 x) public returns (uint64) {
 
             function test2(uint64 x) public returns (uint64) {
 
                 return x ^ 1;
 
                 return x ^ 1;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -236,7 +236,7 @@ fn call() {
 
     runtime.function("test2", Vec::new());
 
     runtime.function("test2", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract superior {
 
         contract superior {
 
             function test1() public {
 
             function test1() public {
 
                 inferior i = new inferior();
 
                 inferior i = new inferior();
 
@@ -287,7 +287,7 @@ fn call() {
 
             function test2(uint64 x) public returns (uint64) {
 
             function test2(uint64 x) public returns (uint64) {
 
                 return x ^ 1;
 
                 return x ^ 1;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -430,7 +430,7 @@ fn data() {
 
     struct String(Vec<u8>);
 
     struct String(Vec<u8>);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract bar {
 
         contract bar {
 
             constructor(string memory s) public {
 
             constructor(string memory s) public {
 
                 assert(msg.data == hex"98dd1bb318666f6f626172");
 
                 assert(msg.data == hex"98dd1bb318666f6f626172");
 
@@ -441,7 +441,7 @@ fn data() {
 
                 assert(msg.data == hex"e3cff634addeadde");
 
                 assert(msg.data == hex"e3cff634addeadde");
 
                 assert(msg.sig == hex"e3cf_f634");
 
                 assert(msg.sig == hex"e3cf_f634");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, String(b"foobar".to_vec()).encode());
 
     runtime.constructor(0, String(b"foobar".to_vec()).encode());
 
@@ -713,7 +713,7 @@ fn my_token() {
 
 #[test]
 
 #[test]
 
 fn hash() {
 
 fn hash() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         import "polkadot";
 
         import "polkadot";
 
 
 
         contract Foo {
 
         contract Foo {
 
@@ -735,7 +735,7 @@ fn hash() {
 
                 assert(abi.encode(current2) == abi.encode(h));
 
                 assert(abi.encode(current2) == abi.encode(h));
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     #[derive(Encode)]
 
     #[derive(Encode)]
 
@@ -759,14 +759,14 @@ fn hash() {
 
 #[test]
 
 #[test]
 
 fn call_chain_extension() {
 
 fn call_chain_extension() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         import {chain_extension as ChainExtension} from "polkadot";
 
         import {chain_extension as ChainExtension} from "polkadot";
 
 
 
         contract Foo {
 
         contract Foo {
 
             function chain_extension(bytes input) public returns (uint32, bytes) {
 
             function chain_extension(bytes input) public returns (uint32, bytes) {
 
                 return ChainExtension(123, input);
 
                 return ChainExtension(123, input);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     let data = 0xdeadbeefu32.to_be_bytes().to_vec();
 
     let data = 0xdeadbeefu32.to_be_bytes().to_vec();
 
@@ -779,13 +779,13 @@ fn call_chain_extension() {
 
 #[test]
 
 #[test]
 
 fn is_contract() {
 
 fn is_contract() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         import "polkadot";
 
         import "polkadot";
 
         contract Foo {
 
         contract Foo {
 
             function test(address _a) public view returns (bool) {
 
             function test(address _a) public view returns (bool) {
 
                 return is_contract(_a);
 
                 return is_contract(_a);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", runtime.0.data().accounts[0].address.to_vec());
 
     runtime.function("test", runtime.0.data().accounts[0].address.to_vec());
 
@@ -798,7 +798,7 @@ fn is_contract() {
 
 #[test]
 
 #[test]
 
 fn set_code_hash() {
 
 fn set_code_hash() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         import "polkadot";
 
         import "polkadot";
 
 
 
         abstract contract SetCode {
 
         abstract contract SetCode {
 
@@ -821,7 +821,7 @@ fn set_code_hash() {
 
             function inc() external {
 
             function inc() external {
 
                 count -= 1;
 
                 count -= 1;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("inc", vec![]);
 
     runtime.function("inc", vec![]);

+ 32 - 32
tests/polkadot_tests/calls.rs
View File 

@@ -9,7 +9,7 @@ struct RevertReturn(u32, String);
 
 #[test]
 
 #[test]
 
 fn revert() {
 
 fn revert() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract bar {
 
         contract bar {
 
             function test() public {
 
             function test() public {
 
                 revert("yo!");
 
                 revert("yo!");
 
@@ -30,7 +30,7 @@ fn revert() {
 
             function d() public {
 
             function d() public {
 
                 revert("revert value has to be passed down the stack");
 
                 revert("revert value has to be passed down the stack");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function_expect_failure("test", Vec::new());
 
     runtime.function_expect_failure("test", Vec::new());
 
@@ -62,7 +62,7 @@ fn revert() {
 
 #[test]
 
 #[test]
 
 fn require() {
 
 fn require() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             function test1() public {
 
             function test1() public {
 
                 require(false, "Program testing can be used to show the presence of bugs, but never to show their absence!");
 
                 require(false, "Program testing can be used to show the presence of bugs, but never to show their absence!");
 
@@ -71,7 +71,7 @@ fn require() {
 
             function test2() public {
 
             function test2() public {
 
                 require(true, "Program testing can be used to show the presence of bugs, but never to show their absence!");
 
                 require(true, "Program testing can be used to show the presence of bugs, but never to show their absence!");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function_expect_failure("test1", Vec::new());
 
     runtime.function_expect_failure("test1", Vec::new());
 
@@ -194,7 +194,7 @@ fn try_catch_external_calls() {
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             function test() public {
 
             function test() public {
 
                 other o = new other();
 
                 other o = new other();
 
@@ -214,14 +214,14 @@ fn try_catch_external_calls() {
 
                 revert("foo");
 
                 revert("foo");
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             function test() public {
 
             function test() public {
 
                 other o = new other();
 
                 other o = new other();
 
@@ -271,7 +271,7 @@ fn try_catch_external_calls() {
 
                 }
 
                 }
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -283,7 +283,7 @@ fn try_catch_external_calls() {
 
     struct Ret(u32);
 
     struct Ret(u32);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract dominator {
 
         contract dominator {
 
             child c;
 
             child c;
 
 
 
@@ -330,7 +330,7 @@ fn try_catch_external_calls() {
 
             function go_bang() public pure returns (int32) {
 
             function go_bang() public pure returns (int32) {
 
                 revert("gone bang in child");
 
                 revert("gone bang in child");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -345,7 +345,7 @@ fn try_catch_external_calls_dont_decode_returns() {
 
     // try not using the return values of test() - revert case
 
     // try not using the return values of test() - revert case
 
     // note the absense of "try o.test() returns (int32 y, bool) {"
 
     // note the absense of "try o.test() returns (int32 y, bool) {"
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             function test() public returns (int32 x) {
 
             function test() public returns (int32 x) {
 
                 other o = new other();
 
                 other o = new other();
 
@@ -362,7 +362,7 @@ fn try_catch_external_calls_dont_decode_returns() {
 
                 revert("foo");
 
                 revert("foo");
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -456,7 +456,7 @@ fn try_catch_constructor() {
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             function test() public {
 
             function test() public {
 
                 int32 x = 0;
 
                 int32 x = 0;
 
@@ -478,7 +478,7 @@ fn try_catch_constructor() {
 
 
 
             function _ext() public {}
 
             function _ext() public {}
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -488,7 +488,7 @@ fn try_catch_constructor() {
 
 #[test]
 
 #[test]
 
 fn local_destructure_call() {
 
 fn local_destructure_call() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             function test() public {
 
             function test() public {
 
                 (, bytes32 b, string s) = foo();
 
                 (, bytes32 b, string s) = foo();
 
@@ -501,7 +501,7 @@ fn local_destructure_call() {
 
                 return (true, "0123", "abcd");
 
                 return (true, "0123", "abcd");
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -687,20 +687,20 @@ fn payable_functions() {
 
 #[test]
 
 #[test]
 
 fn hash_tests() {
 
 fn hash_tests() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes32 hash = keccak256("Hello, World!");
 
                 bytes32 hash = keccak256("Hello, World!");
 
 
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes memory s = "Hello, World!";
 
                 bytes memory s = "Hello, World!";
 
@@ -708,13 +708,13 @@ fn hash_tests() {
 
 
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             bytes s = "Hello, World!";
 
             bytes s = "Hello, World!";
 
 
 
@@ -723,60 +723,60 @@ fn hash_tests() {
 
 
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes32 hash = sha256("Hello, World!");
 
                 bytes32 hash = sha256("Hello, World!");
 
 
 
                 assert(hash == hex"dffd6021bb2bd5b0af676290809ec3a53191dd81c7f70a4b28688a362182986f");
 
                 assert(hash == hex"dffd6021bb2bd5b0af676290809ec3a53191dd81c7f70a4b28688a362182986f");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes32 hash = blake2_256("Hello, World!");
 
                 bytes32 hash = blake2_256("Hello, World!");
 
 
 
                 assert(hash == hex"511bc81dde11180838c562c82bb35f3223f46061ebde4a955c27b3f489cf1e03");
 
                 assert(hash == hex"511bc81dde11180838c562c82bb35f3223f46061ebde4a955c27b3f489cf1e03");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes16 hash = blake2_128("Hello, World!");
 
                 bytes16 hash = blake2_128("Hello, World!");
 
 
 
                 assert(hash == hex"3895c59e4aeb0903396b5be3fbec69fe");
 
                 assert(hash == hex"3895c59e4aeb0903396b5be3fbec69fe");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes20 hash = ripemd160("Hello, World!");
 
                 bytes20 hash = ripemd160("Hello, World!");
 
 
 
                 assert(hash == hex"527a6a4b9a6da75607546842e0e00105350b1aaf");
 
                 assert(hash == hex"527a6a4b9a6da75607546842e0e00105350b1aaf");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -838,7 +838,7 @@ fn try_catch_reachable() {
 
 #[test]
 
 #[test]
 
 fn log_api_call_return_values_works() {
 
 fn log_api_call_return_values_works() {
 
     let mut runtime = build_solidity_with_options(
 
     let mut runtime = build_solidity_with_options(
 
-        r##"
 
+        r#"
 
         contract Test {
 
         contract Test {
 
             constructor () payable {}
 
             constructor () payable {}
 
 
 
@@ -854,7 +854,7 @@ fn log_api_call_return_values_works() {
 
                 print("hi!");
 
                 print("hi!");
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
         true,
 
         true,
 
         false,
 
         false,
 
     );
 
     );

+ 8 - 8
tests/polkadot_tests/contracts.rs
View File 

@@ -44,7 +44,7 @@ fn external_call() {
 
 #[test]
 
 #[test]
 
 fn revert_external_call() {
 
 fn revert_external_call() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             b x;
 
             b x;
 
             constructor() public {
 
             constructor() public {
 
@@ -63,7 +63,7 @@ fn revert_external_call() {
 
             function get_x(int32 t) public returns (int32) {
 
             function get_x(int32 t) public returns (int32) {
 
                 revert("The reason why");
 
                 revert("The reason why");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -74,7 +74,7 @@ fn revert_external_call() {
 
 #[test]
 
 #[test]
 
 fn revert_constructor() {
 
 fn revert_constructor() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             b x;
 
             b x;
 
             constructor() public {
 
             constructor() public {
 
@@ -95,7 +95,7 @@ fn revert_constructor() {
 
             function get_x(int32 t) public returns (int32) {
 
             function get_x(int32 t) public returns (int32) {
 
                 return x * t;
 
                 return x * t;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -108,7 +108,7 @@ fn external_datatypes() {
 
     struct Ret(u64);
 
     struct Ret(u64);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             b x;
 
             b x;
 
             constructor() public {
 
             constructor() public {
 
@@ -144,7 +144,7 @@ fn external_datatypes() {
 
             bytes4 f1;
 
             bytes4 f1;
 
             address f2;
 
             address f2;
 
             int f3;
 
             int f3;
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -191,7 +191,7 @@ fn creation_code() {
 
 #[test]
 
 #[test]
 
 fn issue666() {
 
 fn issue666() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract Flipper {
 
         contract Flipper {
 
             function flip () pure public {
 
             function flip () pure public {
 
                 print("flip");
 
                 print("flip");
 
@@ -208,7 +208,7 @@ fn issue666() {
 
             function superFlip () pure public {
 
             function superFlip () pure public {
 
                 _flipper.flip();
 
                 _flipper.flip();
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());

+ 2 - 2
tests/polkadot_tests/events.rs
View File 

@@ -50,7 +50,7 @@ fn emit() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract a {
 
         contract a {
 
             event foo(bool,uint32,int64 indexed i);
 
             event foo(bool,uint32,int64 indexed i);
 
             event bar(uint32,uint64,string indexed s);
 
             event bar(uint32,uint64,string indexed s);
 
@@ -58,7 +58,7 @@ fn emit() {
 
                 emit foo(true, 102, 1);
 
                 emit foo(true, 102, 1);
 
                 emit bar(0xdeadcafe, 102, "foobar");
 
                 emit bar(0xdeadcafe, 102, "foobar");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());

+ 25 - 59
tests/polkadot_tests/expressions.rs
View File 

@@ -824,11 +824,7 @@ fn power() {
 
     );
 
     );
 
 
 
     // 4**5 = 1024
 
     // 4**5 = 1024
 
-    let args = Val(4)
 
-        .encode()
 
-        .into_iter()
 
-        .chain(Val(5).encode().into_iter())
 
-        .collect();
 
+    let args = Val(4).encode().into_iter().chain(Val(5).encode()).collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
 
 
@@ -838,7 +834,7 @@ fn power() {
 
     let args = Val(2345)
 
     let args = Val(2345)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(1).encode().into_iter())
 
+        .chain(Val(1).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -849,7 +845,7 @@ fn power() {
 
     let args = Val(0xdead_beef)
 
     let args = Val(0xdead_beef)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(0).encode().into_iter())
 
+        .chain(Val(0).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -860,7 +856,7 @@ fn power() {
 
     let args = Val(0)
 
     let args = Val(0)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(0xdead_beef).encode().into_iter())
 
+        .chain(Val(0xdead_beef).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -888,11 +884,7 @@ fn large_power() {
 
     );
 
     );
 
 
 
     // 4**5 = 1024
 
     // 4**5 = 1024
 
-    let args = Val(4)
 
-        .encode()
 
-        .into_iter()
 
-        .chain(Val(5).encode().into_iter())
 
-        .collect();
 
+    let args = Val(4).encode().into_iter().chain(Val(5).encode()).collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
 
 
@@ -902,7 +894,7 @@ fn large_power() {
 
     let args = Val(2345)
 
     let args = Val(2345)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(1).encode().into_iter())
 
+        .chain(Val(1).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -913,7 +905,7 @@ fn large_power() {
 
     let args = Val(0xdeadbeef)
 
     let args = Val(0xdeadbeef)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(0).encode().into_iter())
 
+        .chain(Val(0).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -924,7 +916,7 @@ fn large_power() {
 
     let args = Val(0)
 
     let args = Val(0)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(0xdeadbeef).encode().into_iter())
 
+        .chain(Val(0xdeadbeef).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -935,7 +927,7 @@ fn large_power() {
 
     let args = Val(10)
 
     let args = Val(10)
 
         .encode()
 
         .encode()
 
         .into_iter()
 
         .into_iter()
 
-        .chain(Val(36).encode().into_iter())
 
+        .chain(Val(36).encode())
 
         .collect();
 
         .collect();
 
 
 
     runtime.function("power", args);
 
     runtime.function("power", args);
 
@@ -972,11 +964,7 @@ fn test_power_overflow_boundaries() {
 
 
 
         contract.function(
 
         contract.function(
 
             "pow",
 
             "pow",
 
-            base_data
 
-                .clone()
 
-                .into_iter()
 
-                .chain(exp_data.into_iter())
 
-                .collect(),
 
+            base_data.clone().into_iter().chain(exp_data).collect(),
 
         );
 
         );
 
 
 
         let res = BigUint::from(2_usize).pow((width - 1).try_into().unwrap());
 
         let res = BigUint::from(2_usize).pow((width - 1).try_into().unwrap());
 
@@ -989,10 +977,7 @@ fn test_power_overflow_boundaries() {
 
         let mut exp_data = exp.to_bytes_le();
 
         let mut exp_data = exp.to_bytes_le();
 
         exp_data.resize(width_rounded, 0);
 
         exp_data.resize(width_rounded, 0);
 
 
 
-        contract.function_expect_failure(
 
-            "pow",
 
-            base_data.into_iter().chain(exp_data.into_iter()).collect(),
 
-        );
 
+        contract.function_expect_failure("pow", base_data.into_iter().chain(exp_data).collect());
 
     }
 
     }
 
 }
 
 }
 
 
 
@@ -1038,10 +1023,7 @@ fn multiply() {
 
 
 
         println!("in: a:{a_data:?} b:{b_data:?}");
 
         println!("in: a:{a_data:?} b:{b_data:?}");
 
 
 
-        runtime.function(
 
-            "multiply",
 
-            a_data.into_iter().chain(b_data.into_iter()).collect(),
 
-        );
 
+        runtime.function("multiply", a_data.into_iter().chain(b_data).collect());
 
 
 
         println!("out: res:{:?}", runtime.output());
 
         println!("out: res:{:?}", runtime.output());
 
 
 
@@ -1079,7 +1061,7 @@ fn test_mul_within_range_signed() {
 
         let a_sign = a.sign();
 
         let a_sign = a.sign();
 
         let mut a_data = a.to_signed_bytes_le();
 
         let mut a_data = a.to_signed_bytes_le();
 
 
 
-        let side = vec![-1, 0, 1];
 
+        let side = [-1, 0, 1];
 
         let b = BigInt::from(*side.choose(&mut rng).unwrap());
 
         let b = BigInt::from(*side.choose(&mut rng).unwrap());
 
         let b_sign = b.sign();
 
         let b_sign = b.sign();
 
         let mut b_data = b.to_signed_bytes_le();
 
         let mut b_data = b.to_signed_bytes_le();
 
@@ -1087,10 +1069,7 @@ fn test_mul_within_range_signed() {
 
         a_data.resize(width_rounded, sign_extend(a_sign));
 
         a_data.resize(width_rounded, sign_extend(a_sign));
 
         b_data.resize(width_rounded, sign_extend(b_sign));
 
         b_data.resize(width_rounded, sign_extend(b_sign));
 
 
 
-        runtime.function(
 
-            "mul",
 
-            a_data.into_iter().chain(b_data.into_iter()).collect(),
 
-        );
 
+        runtime.function("mul", a_data.into_iter().chain(b_data).collect());
 
 
 
         let value = a * b;
 
         let value = a * b;
 
         let value_sign = value.sign();
 
         let value_sign = value.sign();
 
@@ -1128,10 +1107,7 @@ fn test_mul_within_range() {
 
         a_data.resize(width_rounded, 0);
 
         a_data.resize(width_rounded, 0);
 
         b_data.resize(width_rounded, 0);
 
         b_data.resize(width_rounded, 0);
 
 
 
-        runtime.function(
 
-            "mul",
 
-            a_data.into_iter().chain(b_data.into_iter()).collect(),
 
-        );
 
+        runtime.function("mul", a_data.into_iter().chain(b_data).collect());
 
 
 
         let value = a * b;
 
         let value = a * b;
 
 
 
@@ -1176,7 +1152,7 @@ fn test_overflow_boundaries() {
 
             up_data
 
             up_data
 
                 .clone()
 
                 .clone()
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(sec_data.clone().into_iter())
 
+                .chain(sec_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
 
 
@@ -1191,7 +1167,7 @@ fn test_overflow_boundaries() {
 
             low_data
 
             low_data
 
                 .clone()
 
                 .clone()
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(sec_data.clone().into_iter())
 
+                .chain(sec_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
 
 
@@ -1224,7 +1200,7 @@ fn test_overflow_boundaries() {
 
             upper_second_op_data
 
             upper_second_op_data
 
                 .clone()
 
                 .clone()
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(two_data.clone().into_iter())
 
+                .chain(two_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
 
 
@@ -1234,18 +1210,14 @@ fn test_overflow_boundaries() {
 
             lower_second_op_data
 
             lower_second_op_data
 
                 .clone()
 
                 .clone()
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(two_data.clone().into_iter())
 
+                .chain(two_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
 
 
         // Upper boundary * Upper boundary
 
         // Upper boundary * Upper boundary
 
         contract.function_expect_failure(
 
         contract.function_expect_failure(
 
             "mul",
 
             "mul",
 
-            up_data
 
-                .clone()
 
-                .into_iter()
 
-                .chain(up_data.clone().into_iter())
 
-                .collect(),
 
+            up_data.clone().into_iter().chain(up_data.clone()).collect(),
 
         );
 
         );
 
 
 
         // Lower boundary * Lower boundary
 
         // Lower boundary * Lower boundary
 
@@ -1254,7 +1226,7 @@ fn test_overflow_boundaries() {
 
             low_data
 
             low_data
 
                 .clone()
 
                 .clone()
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(low_data.clone().into_iter())
 
+                .chain(low_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
 
 
@@ -1264,7 +1236,7 @@ fn test_overflow_boundaries() {
 
             low_data
 
             low_data
 
                 .clone()
 
                 .clone()
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(up_data.clone().into_iter())
 
+                .chain(up_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
     }
 
     }
 
@@ -1307,7 +1279,7 @@ fn test_overflow_detect_signed() {
 
             "mul",
 
             "mul",
 
             first_op_data
 
             first_op_data
 
                 .into_iter()
 
                 .into_iter()
 
-                .chain(second_op_data.clone().into_iter())
 
+                .chain(second_op_data.clone())
 
                 .collect(),
 
                 .collect(),
 
         );
 
         );
 
 
 
@@ -1324,10 +1296,7 @@ fn test_overflow_detect_signed() {
 
 
 
         contract.function_expect_failure(
 
         contract.function_expect_failure(
 
             "mul",
 
             "mul",
 
-            first_op_data
 
-                .into_iter()
 
-                .chain(second_op_data.into_iter())
 
-                .collect(),
 
+            first_op_data.into_iter().chain(second_op_data).collect(),
 
         );
 
         );
 
     }
 
     }
 
 }
 
 }
 
@@ -1365,10 +1334,7 @@ fn test_overflow_detect_unsigned() {
 
 
 
         contract.function_expect_failure(
 
         contract.function_expect_failure(
 
             "mul",
 
             "mul",
 
-            first_op_data
 
-                .into_iter()
 
-                .chain(second_op_data.into_iter())
 
-                .collect(),
 
+            first_op_data.into_iter().chain(second_op_data).collect(),
 
         );
 
         );
 
     }
 
     }
 
 }
 
 }

+ 20 - 20
tests/polkadot_tests/format.rs
View File 

@@ -6,12 +6,12 @@ use parity_scale_codec::Encode;
 
 #[test]
 
 #[test]
 
 fn output() {
 
 fn output() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(bool x) public {
 
             function foo(bool x) public {
 
                 print("val:{}".format(x));
 
                 print("val:{}".format(x));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -27,12 +27,12 @@ fn output() {
 
     assert_eq!(runtime.debug_buffer(), "print: val:false,\n");
 
     assert_eq!(runtime.debug_buffer(), "print: val:false,\n");
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(bytes bar) public {
 
             function foo(bytes bar) public {
 
                 print("bar:{}".format(bar));
 
                 print("bar:{}".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -42,12 +42,12 @@ fn output() {
 
     assert_eq!(runtime.debug_buffer(), "print: bar:41424344,\n");
 
     assert_eq!(runtime.debug_buffer(), "print: bar:41424344,\n");
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(bytes5 bar) public {
 
             function foo(bytes5 bar) public {
 
                 print("bar:{}".format(bar));
 
                 print("bar:{}".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -57,12 +57,12 @@ fn output() {
 
     assert_eq!(runtime.debug_buffer(), "print: bar:0103fe0709,\n");
 
     assert_eq!(runtime.debug_buffer(), "print: bar:0103fe0709,\n");
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(string bar) public {
 
             function foo(string bar) public {
 
                 print("bar:{} address:{}".format(bar, this));
 
                 print("bar:{} address:{}".format(bar, this));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -78,12 +78,12 @@ fn output() {
 
     );
 
     );
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(uint64 bar) public {
 
             function foo(uint64 bar) public {
 
                 print("bar:{:x}".format(bar));
 
                 print("bar:{:x}".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -105,12 +105,12 @@ fn output() {
 
     assert_eq!(runtime.debug_buffer(), "print: bar:0x0,\n");
 
     assert_eq!(runtime.debug_buffer(), "print: bar:0x0,\n");
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(int128 bar) public {
 
             function foo(int128 bar) public {
 
                 print("bar:{:x}".format(bar));
 
                 print("bar:{:x}".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -123,12 +123,12 @@ fn output() {
 
     );
 
     );
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(int128 bar) public {
 
             function foo(int128 bar) public {
 
                 print("there is an old android joke which goes {:b} ".format(bar));
 
                 print("there is an old android joke which goes {:b} ".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -140,12 +140,12 @@ fn output() {
 
     assert!(runtime.debug_buffer().contains("goes -0b111111 ,"));
 
     assert!(runtime.debug_buffer().contains("goes -0b111111 ,"));
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(int64 bar) public {
 
             function foo(int64 bar) public {
 
                 print("number:{} ".format(bar));
 
                 print("number:{} ".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -157,12 +157,12 @@ fn output() {
 
     assert!(runtime.debug_buffer().contains("print: number:-102 ,"));
 
     assert!(runtime.debug_buffer().contains("print: number:-102 ,"));
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             function foo(int128 bar) public {
 
             function foo(int128 bar) public {
 
                 print("number:{} ".format(bar));
 
                 print("number:{} ".format(bar));
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -197,7 +197,7 @@ fn output() {
 
     runtime.debug_buffer().truncate(0);
 
     runtime.debug_buffer().truncate(0);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract format {
 
         contract format {
 
             enum enum1 { bar1, bar2, bar3 }
 
             enum enum1 { bar1, bar2, bar3 }
 
             function foo(int256 bar) public {
 
             function foo(int256 bar) public {
 
@@ -212,7 +212,7 @@ fn output() {
 
             function e() public returns (string) {
 
             function e() public returns (string) {
 
                 return "number<{}>".format(enum1.bar3);
 
                 return "number<{}>".format(enum1.bar3);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());

+ 4 - 4
tests/polkadot_tests/function_types.rs
View File 

@@ -203,7 +203,7 @@ fn virtual_contract_function() {
 
 #[test]
 
 #[test]
 
 fn ext() {
 
 fn ext() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract ft {
 
         contract ft {
 
             function test() public {
 
             function test() public {
 
                 function(int32) external returns (bool) func = this.foo;
 
                 function(int32) external returns (bool) func = this.foo;
 
@@ -215,7 +215,7 @@ fn ext() {
 
             function foo(int32) public returns (bool) {
 
             function foo(int32) public returns (bool) {
 
                 return false;
 
                 return false;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -335,7 +335,7 @@ fn ext() {
 
 #[test]
 
 #[test]
 
 fn encode_decode_ext_func() {
 
 fn encode_decode_ext_func() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract A {
 
         contract A {
 
             @selector([0,0,0,0])
 
             @selector([0,0,0,0])
 
             function a() public pure returns (uint8) {
 
             function a() public pure returns (uint8) {
 
@@ -362,7 +362,7 @@ fn encode_decode_ext_func() {
 
                 return dec2{flags: 8}();
 
                 return dec2{flags: 8}();
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.function("it", vec![]);
 
     runtime.function("it", vec![]);

+ 4 - 4
tests/polkadot_tests/mappings.rs
View File 

@@ -9,7 +9,7 @@ use crate::build_solidity;
 
 #[test]
 
 #[test]
 
 fn basic() {
 
 fn basic() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract c {
 
         contract c {
 
             mapping(uint => bytes4) data;
 
             mapping(uint => bytes4) data;
 
 
 
@@ -19,7 +19,7 @@ fn basic() {
 
                 assert(data[1] == hex"cafedead");
 
                 assert(data[1] == hex"cafedead");
 
             }
 
             }
 
         }
 
         }
 
-        "##,
 
+        "#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -206,7 +206,7 @@ fn test_user() {
 
     struct GetRet(bool, [u8; 32]);
 
     struct GetRet(bool, [u8; 32]);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract b {
 
         contract b {
 
             struct user {
 
             struct user {
 
                 bool exists;
 
                 bool exists;
 
@@ -238,7 +238,7 @@ fn test_user() {
 
 
 
                 return (s.exists, s.addr);
 
                 return (s.exists, s.addr);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     let mut rng = rand::thread_rng();
 
     let mut rng = rand::thread_rng();

+ 4 - 4
tests/polkadot_tests/modifier.rs
View File 

@@ -268,7 +268,7 @@ fn return_values() {
 
     assert_eq!(runtime.output(), Val(5).encode());
 
     assert_eq!(runtime.output(), Val(5).encode());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         struct S {
 
         struct S {
 
             int64 f1;
 
             int64 f1;
 
             string f2;
 
             string f2;
 
@@ -288,7 +288,7 @@ fn return_values() {
 
                     _;
 
                     _;
 
                     s2 += 2;
 
                     s2 += 2;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -307,7 +307,7 @@ fn return_values() {
 
 #[test]
 
 #[test]
 
 fn repeated_modifier() {
 
 fn repeated_modifier() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract Test {
 
         contract Test {
 
             modifier notZero(uint64 num) {
 
             modifier notZero(uint64 num) {
 
                 require(num != 0, "invalid number");
 
                 require(num != 0, "invalid number");
 
@@ -317,7 +317,7 @@ fn repeated_modifier() {
 
             function contfunc(uint64 num1, uint64 num2) public notZero(num1) notZero(num2) {
 
             function contfunc(uint64 num1, uint64 num2) public notZero(num1) notZero(num2) {
 
                 // any code
 
                 // any code
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());

+ 6 - 6
tests/polkadot_tests/primitives.rs
View File 

@@ -99,7 +99,7 @@ fn bytes() {
 
 
 
     // parse
 
     // parse
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test {
 
         contract test {
 
             function const3() public returns (bytes3) {
 
             function const3() public returns (bytes3) {
 
                 return hex"112233";
 
                 return hex"112233";
 
@@ -142,7 +142,7 @@ fn bytes() {
 
                     hex"00d4f4fc2f5752f06faf7ece82edbdcd093e8ee1144d482ea5820899b3520315"
 
                     hex"00d4f4fc2f5752f06faf7ece82edbdcd093e8ee1144d482ea5820899b3520315"
 
                 );
 
                 );
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("const3", Vec::new());
 
     runtime.function("const3", Vec::new());
 
@@ -225,7 +225,7 @@ fn address() {
 
 fn type_name() {
 
 fn type_name() {
 
     // parse
 
     // parse
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test {
 
         contract test {
 
             function foo() public returns (uint32) {
 
             function foo() public returns (uint32) {
 
                 assert(type(foobar).name == "foobar");
 
                 assert(type(foobar).name == "foobar");
 
@@ -239,7 +239,7 @@ fn type_name() {
 
 
 
         abstract contract foobar {
 
         abstract contract foobar {
 
             int32 a;
 
             int32 a;
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("foo", Vec::new());
 
     runtime.function("foo", Vec::new());
 
@@ -315,7 +315,7 @@ fn units() {
 
 fn literal_bytes_cast() {
 
 fn literal_bytes_cast() {
 
     // parse
 
     // parse
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test {
 
         contract test {
 
             function foo() public {
 
             function foo() public {
 
                 bytes4 x = bytes4(hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
                 bytes4 x = bytes4(hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
@@ -327,7 +327,7 @@ fn literal_bytes_cast() {
 
 
 
                 assert(bytes4(x) == hex"acaf_3289");
 
                 assert(bytes4(x) == hex"acaf_3289");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("foo", Vec::new());
 
     runtime.function("foo", Vec::new());

File diff suppressed because it is too large
+ 39 - 39
tests/polkadot_tests/strings.rs


+ 20 - 20
tests/polkadot_tests/structs.rs
View File 

@@ -14,7 +14,7 @@ struct Val8(u8);
 
 #[test]
 
 #[test]
 
 fn struct_members() {
 
 fn struct_members() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         pragma solidity 0;
 
         pragma solidity 0;
 
         pragma experimental ABIEncoderV2;
 
         pragma experimental ABIEncoderV2;
 
 
 
@@ -47,7 +47,7 @@ fn struct_members() {
 
                         assert(f3.y == 102);
 
                         assert(f3.y == 102);
 
                         assert(f3.d == hex"00dead");
 
                         assert(f3.d == hex"00dead");
 
                     }
 
                     }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -99,7 +99,7 @@ fn structs_encode() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test_struct_parsing {
 
         contract test_struct_parsing {
 
             struct foo {
 
             struct foo {
 
                 bytes3 f1;
 
                 bytes3 f1;
 
@@ -110,7 +110,7 @@ fn structs_encode() {
 
                 assert(f.f1 == "ABC");
 
                 assert(f.f1 == "ABC");
 
                 assert(f.f2 == true);
 
                 assert(f.f2 == true);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function(
 
     runtime.function(
 
@@ -132,7 +132,7 @@ fn structs_decode() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test_struct_parsing {
 
         contract test_struct_parsing {
 
             struct foo {
 
             struct foo {
 
                 bytes3 f1;
 
                 bytes3 f1;
 
@@ -147,7 +147,7 @@ fn structs_decode() {
 
 
 
                 return f;
 
                 return f;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -166,7 +166,7 @@ fn structs_decode() {
 
     // the allocation and also that the abi encoder can
 
     // the allocation and also that the abi encoder can
 
     // an struct when the pointer is still null
 
     // an struct when the pointer is still null
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test_struct_parsing {
 
         contract test_struct_parsing {
 
             struct foo {
 
             struct foo {
 
                 bytes3 f1;
 
                 bytes3 f1;
 
@@ -181,7 +181,7 @@ fn structs_decode() {
 
 
 
                 return f;
 
                 return f;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -263,7 +263,7 @@ fn structs_decode() {
 
 #[test]
 
 #[test]
 
 fn struct_in_struct() {
 
 fn struct_in_struct() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         pragma solidity 0;
 
         pragma solidity 0;
 
 
 
         contract struct_in_struct {
 
         contract struct_in_struct {
 
@@ -288,7 +288,7 @@ fn struct_in_struct() {
 
 
 
                 return f.b;
 
                 return f.b;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -309,7 +309,7 @@ fn structs_in_structs_decode() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test_struct_parsing {
 
         contract test_struct_parsing {
 
             struct foo {
 
             struct foo {
 
                 bytes3 f1;
 
                 bytes3 f1;
 
@@ -327,7 +327,7 @@ fn structs_in_structs_decode() {
 
 
 
                 return f;
 
                 return f;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
@@ -364,7 +364,7 @@ fn structs_in_structs_encode() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test_struct_parsing {
 
         contract test_struct_parsing {
 
             struct foo {
 
             struct foo {
 
                 bytes3 f1;
 
                 bytes3 f1;
 
@@ -383,7 +383,7 @@ fn structs_in_structs_encode() {
 
                 test_struct_parsing.foo b;
 
                 test_struct_parsing.foo b;
 
                 test_struct_parsing.foo c;
 
                 test_struct_parsing.foo c;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function(
 
     runtime.function(
 
@@ -406,7 +406,7 @@ fn structs_in_structs_encode() {
 
 #[test]
 
 #[test]
 
 fn struct_storage_to_memory() {
 
 fn struct_storage_to_memory() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract test_struct_parsing {
 
         contract test_struct_parsing {
 
             struct foo {
 
             struct foo {
 
                 bytes3 f1;
 
                 bytes3 f1;
 
@@ -425,7 +425,7 @@ fn struct_storage_to_memory() {
 
                 assert(f.f1 == hex"123456");
 
                 assert(f.f1 == hex"123456");
 
                 assert(f.f2 == 81985529216486895);
 
                 assert(f.f2 == 81985529216486895);
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -442,7 +442,7 @@ fn return_from_struct_storage() {
 
     }
 
     }
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         struct foo {
 
         struct foo {
 
             bytes3 f1;
 
             bytes3 f1;
 
             uint32 f2;
 
             uint32 f2;
 
@@ -458,7 +458,7 @@ fn return_from_struct_storage() {
 
             function test() public returns (foo) {
 
             function test() public returns (foo) {
 
                 return bar;
 
                 return bar;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -600,7 +600,7 @@ fn encode_decode_bytes_in_field() {
 
     struct Foo([u8; 4]);
 
     struct Foo([u8; 4]);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract encode_decode_bytes_in_field {
 
         contract encode_decode_bytes_in_field {
 
             struct foo { bytes4 f1; }
 
             struct foo { bytes4 f1; }
 
             function test() public pure returns(foo) {
 
             function test() public pure returns(foo) {
 
@@ -608,7 +608,7 @@ fn encode_decode_bytes_in_field() {
 
                 assert(abi.encode(f) == hex"41424344");
 
                 assert(abi.encode(f) == hex"41424344");
 
                 return f;
 
                 return f;
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.function("test", vec![]);
 
     runtime.function("test", vec![]);

+ 4 - 4
tests/polkadot_tests/value.rs
View File 

@@ -196,7 +196,7 @@ fn constructor_salt() {
 
     runtime.function("step1", Vec::new());
 
     runtime.function("step1", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract b {
 
         contract b {
 
             function step1() public {
 
             function step1() public {
 
                 a f = new a{salt: hex"01"}();
 
                 a f = new a{salt: hex"01"}();
 
@@ -206,7 +206,7 @@ fn constructor_salt() {
 
         contract a {
 
         contract a {
 
             function test(int32 l) public payable {
 
             function test(int32 l) public payable {
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
 
 
@@ -214,7 +214,7 @@ fn constructor_salt() {
 
 
 
     // we can instantiate the same contract if we provide a different contract
 
     // we can instantiate the same contract if we provide a different contract
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract b {
 
         contract b {
 
             function step1() public {
 
             function step1() public {
 
                 a f = new a{salt: hex"01"}();
 
                 a f = new a{salt: hex"01"}();
 
@@ -225,7 +225,7 @@ fn constructor_salt() {
 
         contract a {
 
         contract a {
 
             function test(int32 l) public payable {
 
             function test(int32 l) public payable {
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());

+ 4 - 4
tests/polkadot_tests/variables.rs
View File 

@@ -21,13 +21,13 @@ fn global_constants() {
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         string constant foo = "FOO";
 
         string constant foo = "FOO";
 
         contract error {
 
         contract error {
 
             function test() public payable {
 
             function test() public payable {
 
                 assert(foo == "FOO");
 
                 assert(foo == "FOO");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());
 
@@ -35,14 +35,14 @@ fn global_constants() {
 
     runtime.function("test", Vec::new());
 
     runtime.function("test", Vec::new());
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         string constant foo = "FOO";
 
         string constant foo = "FOO";
 
         contract a {
 
         contract a {
 
             function test(uint64 error) public payable {
 
             function test(uint64 error) public payable {
 
                 assert(error == 0);
 
                 assert(error == 0);
 
                 assert(foo == "FOO");
 
                 assert(foo == "FOO");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(0, Vec::new());
 
     runtime.constructor(0, Vec::new());

+ 6 - 6
tests/solana_tests/hash.rs
View File 

@@ -5,42 +5,42 @@ use crate::{build_solidity, BorshToken};
 
 #[test]
 
 #[test]
 
 fn constants_hash_tests() {
 
 fn constants_hash_tests() {
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes32 hash = keccak256("Hello, World!");
 
                 bytes32 hash = keccak256("Hello, World!");
 
 
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
                 assert(hash == hex"acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(&[]);
 
     runtime.constructor(&[]);
 
     runtime.function("test", &[]);
 
     runtime.function("test", &[]);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes32 hash = sha256("Hello, World!");
 
                 bytes32 hash = sha256("Hello, World!");
 
 
 
                 assert(hash == hex"dffd6021bb2bd5b0af676290809ec3a53191dd81c7f70a4b28688a362182986f");
 
                 assert(hash == hex"dffd6021bb2bd5b0af676290809ec3a53191dd81c7f70a4b28688a362182986f");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(&[]);
 
     runtime.constructor(&[]);
 
     runtime.function("test", &[]);
 
     runtime.function("test", &[]);
 
 
 
     let mut runtime = build_solidity(
 
     let mut runtime = build_solidity(
 
-        r##"
 
+        r#"
 
         contract tester {
 
         contract tester {
 
             function test() public {
 
             function test() public {
 
                 bytes20 hash = ripemd160("Hello, World!");
 
                 bytes20 hash = ripemd160("Hello, World!");
 
 
 
                 assert(hash == hex"527a6a4b9a6da75607546842e0e00105350b1aaf");
 
                 assert(hash == hex"527a6a4b9a6da75607546842e0e00105350b1aaf");
 
             }
 
             }
 
-        }"##,
 
+        }"#,
 
     );
 
     );
 
 
 
     runtime.constructor(&[]);
 
     runtime.constructor(&[]);

+ 1 - 1
tests/solana_tests/primitives.rs
View File 

@@ -1005,7 +1005,7 @@ fn test_mul_within_range_signed() {
 
         let first_operand_rand = rng.gen_bigint(width - 1).sub(1_u32);
 
         let first_operand_rand = rng.gen_bigint(width - 1).sub(1_u32);
 
         println!("First op : {first_operand_rand:?}");
 
         println!("First op : {first_operand_rand:?}");
 
 
 
-        let side = vec![-1, 0, 1];
 
+        let side = [-1, 0, 1];
 
         // -1, 1 or 0
 
         // -1, 1 or 0
 
         let second_op = BigInt::from(*side.choose(&mut rng).unwrap());
 
         let second_op = BigInt::from(*side.choose(&mut rng).unwrap());
 
         println!("second op : {second_op:?}");
 
         println!("second op : {second_op:?}");

Some files were not shown because too many files changed in this diff