Bump dependencies

Signed-off-by: Sean Young <sean@mess.org>

Cargo.toml

@@ -31,7 +31,7 @@ contract-metadata = "0.3.0"
 semver = { version = "^1.0.3", features = ["serde"] }
 tempfile = "3.3"
 libc = { version = "0.2", optional = true }
-tower-lsp = "0.15"
+tower-lsp = "0.16"
 tokio = { version = "1.16", features = ["rt", "io-std", "macros"] }
 base58 = "0.2.0"
 sha2 = "0.10"
@@ -41,22 +41,21 @@ funty = "2.0"
 itertools = "0.10"
 num-rational = "0.4"
 indexmap = "1.8"
-once_cell = "1.9"
-solang-parser = { path = "solang-parser", version = "0.1.11"}
+once_cell = "1.10"
+solang-parser = { path = "solang-parser", version = "0.1.11" }
 codespan-reporting = "0.11"
 phf = "0.10.1"
 
 [dev-dependencies]
 num-derive = "0.3"
-parity-scale-codec-derive = "3.0.0"
-parity-scale-codec = "3.0.0"
-ethabi = "16.0"
+parity-scale-codec = "3.1"
+ethabi = "17.0"
 wasmi = "0.11"
 rand = "0.7"
 sha2 = "0.10"
 # solana_rbpf makes api changes in patch versions
 solana_rbpf = "=0.2.24"
-byteorder = "1.3"
+byteorder = "1.4"
 assert_cmd = "2.0"
 bincode = "1.3"
 ed25519-dalek = "1.0"

src/bin/languageserver/mod.rs

@@ -31,16 +31,13 @@ pub async fn start_server(target: Target) {
     let stdin = tokio::io::stdin();
     let stdout = tokio::io::stdout();
 
-    let (service, messages) = LspService::new(|client| SolangServer {
+    let (service, socket) = LspService::new(|client| SolangServer {
         client,
         target,
         files: Mutex::new(HashMap::new()),
     });
 
-    Server::new(stdin, stdout)
-        .interleave(messages)
-        .serve(service)
-        .await;
+    Server::new(stdin, stdout, socket).serve(service).await;
 
     std::process::exit(1);
 }

tests/solana_tests/balance.rs

@@ -427,7 +427,7 @@ fn receive() {
                 name: "extinct".to_string(),
                 inputs: vec![],
                 outputs: vec![],
-                constant: false,
+                constant: None,
                 state_mutability: StateMutability::Payable,
             }],
         );

tests/substrate_tests/arrays.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use rand::Rng;
 
 use crate::build_solidity;

tests/substrate_tests/builtins.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 use crate::build_solidity;
 

tests/substrate_tests/calls.rs

@@ -1,7 +1,5 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
-
 use crate::build_solidity;
+use parity_scale_codec::{Decode, Encode};
 
 #[derive(Debug, PartialEq, Encode, Decode)]
 struct RevertReturn(u32, String);

tests/substrate_tests/contracts.rs

@@ -1,7 +1,5 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
-
 use crate::build_solidity;
+use parity_scale_codec::{Decode, Encode};
 
 #[derive(Debug, PartialEq, Encode, Decode)]
 struct RevertReturn(u32, String);

tests/substrate_tests/enums.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 use crate::build_solidity;
 

tests/substrate_tests/events.rs

@@ -1,6 +1,5 @@
 use crate::{build_solidity, no_errors};
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use solang::{file_resolver::FileResolver, Target};
 use std::ffi::OsStr;
 

tests/substrate_tests/expressions.rs

@@ -2,7 +2,6 @@ use crate::{build_solidity, build_solidity_with_overflow_check};
 use num_bigint::BigInt;
 use num_bigint::Sign;
 use parity_scale_codec::{Decode, Encode};
-use parity_scale_codec_derive::{Decode, Encode};
 use rand::Rng;
 
 #[test]

tests/substrate_tests/first.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 use crate::build_solidity;
 

tests/substrate_tests/function_types.rs

@@ -1,6 +1,5 @@
 use crate::build_solidity;
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 #[test]
 fn simple_test() {

tests/substrate_tests/functions.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 use crate::build_solidity;
 

tests/substrate_tests/inheritance.rs

@@ -1,6 +1,5 @@
 use crate::{build_solidity, no_errors};
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use solang::file_resolver::FileResolver;
 use solang::Target;
 use std::ffi::OsStr;

tests/substrate_tests/libraries.rs

@@ -1,6 +1,5 @@
 use crate::build_solidity;
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 #[test]
 fn simple() {

tests/substrate_tests/mappings.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use rand::Rng;
 use std::collections::HashMap;
 

tests/substrate_tests/modifier.rs

@@ -1,6 +1,5 @@
 use crate::build_solidity;
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 #[test]
 fn chain() {

tests/substrate_tests/primitives.rs

@@ -1,6 +1,5 @@
 use crate::build_solidity;
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 #[test]
 fn various_constants() {

tests/substrate_tests/strings.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use rand::Rng;
 
 use crate::build_solidity;

tests/substrate_tests/structs.rs

@@ -1,5 +1,4 @@
 use parity_scale_codec::{Decode, Encode};
-use parity_scale_codec_derive::{Decode, Encode};
 use serde_derive::Deserialize;
 
 use crate::build_solidity;

tests/substrate_tests/value.rs

@@ -1,5 +1,4 @@
-use parity_scale_codec::Encode;
-use parity_scale_codec_derive::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 use crate::build_solidity;