chore: update near-sdk pointer to 5.0.0-alpha.1

near · Dec 18, 2023 · b455d50 · b455d50
1 parent 39784f8
commit b455d50
Show file tree

Hide file tree

Showing 26 changed files with 100 additions and 101 deletions.
diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
@@ -12,11 +12,12 @@ pub mod from_crates_io {
 pub mod from_git {
     use const_format::formatcp;
 
-    pub const SDK_VERSION: &str = "4.1.1";
-    pub const SDK_REVISION: &str = "15bfb0e6d54ff386478d137074027c2cb863df03";
+    pub const SDK_VERSION: &str = "5.0.0-alpha.1";
+    pub const SDK_REVISION: &str = "117c0dff79d647a0186dd3a8542488a6e410adad";
     pub const SDK_SHORT_VERSION_TOML: &str = formatcp!(r#"version = "{SDK_VERSION}""#);
+    pub const SDK_REPO: &str = "https://github.com/dj8yfo/near-sdk-rs.git";
     pub const SDK_VERSION_TOML: &str = formatcp!(
-        r#"version = "{SDK_VERSION}", git = "https://github.com/near/near-sdk-rs.git", rev = "{SDK_REVISION}""#
+        r#"version = "{SDK_VERSION}", git = "{SDK_REPO}", rev = "{SDK_REVISION}""#
     );
     pub const SDK_VERSION_TOML_TABLE: &str = formatcp!(
         r#"
@@ -43,6 +44,7 @@ macro_rules! invoke_cargo_near {
         $(cargo_vars = $cargo_vars)?;
         cargo_vars.insert("sdk-cratesio-version", $crate::from_crates_io::SDK_VERSION);
         cargo_vars.insert("sdk-cratesio-version-toml", $crate::from_crates_io::SDK_VERSION_TOML);
+        cargo_vars.insert("sdk-git-version", $crate::from_git::SDK_VERSION);
         cargo_vars.insert("sdk-git-short-version-toml", $crate::from_git::SDK_SHORT_VERSION_TOML);
         cargo_vars.insert("sdk-git-version-toml", $crate::from_git::SDK_VERSION_TOML);
         cargo_vars.insert("sdk-git-version-toml-table", $crate::from_git::SDK_VERSION_TOML_TABLE);

diff --git a/integration-tests/templates/_Cargo.toml b/integration-tests/templates/_Cargo.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib"]
 # near-sdk = { features = ["unstable"], ::sdk-cratesio-version-toml:: }
 near-sdk = { features = ["unstable"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/negative/_Cargo_malformed.toml b/integration-tests/templates/negative/_Cargo_malformed.toml
@@ -7,9 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = 4
+near-sdk = 5
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/negative/_Cargo_no_abi_feature.toml b/integration-tests/templates/negative/_Cargo_no_abi_feature.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib"]
 # near-sdk = { default-features = false, ::sdk-cratesio-version-toml:: }
 near-sdk = { default-features = false, ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/negative/_Cargo_old_sdk.toml b/integration-tests/templates/negative/_Cargo_old_sdk.toml
@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = "=4.0.0"
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_explicit.toml b/integration-tests/templates/sdk-dependency/_Cargo_explicit.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib"]
 # near-sdk = { features = ["abi"], ::sdk-cratesio-version-toml:: }
 near-sdk = { features = ["abi"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_local_path.toml b/integration-tests/templates/sdk-dependency/_Cargo_local_path.toml
@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = { path = "::path::" }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_local_path_with_version.toml b/integration-tests/templates/sdk-dependency/_Cargo_local_path_with_version.toml
@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = { path = "::path::", ::sdk-git-short-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib"]
 # near-sdk = { features = ["abi", "unstable"], ::sdk-cratesio-version-toml:: }
 near-sdk = { features = ["abi", "unstable"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib"]
 # near-sdk = { default-features = false, features = ["abi"], ::sdk-cratesio-version-toml:: }
 near-sdk = { default-features = false, features = ["abi"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_not_a_table.toml b/integration-tests/templates/sdk-dependency/_Cargo_not_a_table.toml
@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = "::sdk-cratesio-version::"
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_patch.toml b/integration-tests/templates/sdk-dependency/_Cargo_patch.toml
@@ -7,9 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "4.0.0"
+near-sdk = "::sdk-git-version::"
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [patch.crates-io.near-sdk]
 ::sdk-git-version-toml-table::

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml b/integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml
@@ -8,7 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
+
 
 [target.'cfg(windows)'.dependencies]
 # NOTE: uncomment line 15 and comment 16, if it's desirable to switch to published `near-sdk` version

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_renamed.toml b/integration-tests/templates/sdk-dependency/_Cargo_renamed.toml
@@ -8,7 +8,6 @@ crate-type = ["cdylib"]
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [dependencies.near]
 near = { package = "near-sdk", ::sdk-git-version-toml:: }

diff --git a/integration-tests/tests/abi/borsh_schema.rs b/integration-tests/tests/abi/borsh_schema.rs
@@ -19,8 +19,8 @@ fn test_borsh_schema_numeric_primitives_signed() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 6);
     let i8_schema = BorshSchemaContainer::new(
@@ -69,8 +69,8 @@ fn test_borsh_schema_numeric_primitives_unsigned() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 6);
     let u8_schema = BorshSchemaContainer::new(
@@ -111,8 +111,8 @@ fn test_borsh_schema_numeric_primitives_float() -> cargo_near::CliResult {
         pub fn foo(&self, #[serializer(borsh)] a: f32, #[serializer(borsh)] b: f64) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     let f32_schema = BorshSchemaContainer::new(
@@ -136,8 +136,8 @@ fn test_borsh_schema_string() -> cargo_near::CliResult {
         pub fn foo(&self, #[serializer(borsh)] a: String, #[serializer(borsh)] b: &str, #[serializer(borsh)] c: &'static str) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 3);
     let string_schema = BorshSchemaContainer::new(
@@ -168,8 +168,8 @@ fn test_borsh_schema_other_primitives() -> cargo_near::CliResult {
         pub fn foo(&self, #[serializer(borsh)] b: bool, #[serializer(borsh)] c: ()) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     // char is unsupported by borsh spec
@@ -203,8 +203,8 @@ fn test_borsh_schema_tuples() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 3);
     let tuple1_schema = BorshSchemaContainer::new(
@@ -262,8 +262,8 @@ fn test_borsh_schema_arrays() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 3);
     let array8_schema = BorshSchemaContainer::new(
@@ -346,8 +346,8 @@ fn test_borsh_schema_struct() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     let pair_def_schema = BorshSchemaContainer::new(
@@ -417,8 +417,8 @@ fn test_borsh_schema_enum() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     let ip_addr_kind_def_schema = BorshSchemaContainer::new(
@@ -529,8 +529,8 @@ fn test_borsh_schema_complex() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 1);
     let ip_addr_def_schema = BorshSchemaContainer::new(

diff --git a/integration-tests/tests/abi/callbacks.rs b/integration-tests/tests/abi/callbacks.rs
@@ -12,8 +12,8 @@ fn test_callbacks_unwrapped() -> cargo_near::CliResult {
         pub fn foo(&self, #[callback_unwrap] a: bool, #[callback_unwrap] b: u32) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 0);
     assert_eq!(function.callbacks.len(), 2);
@@ -46,8 +46,8 @@ fn test_callbacks_result() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 0);
     assert_eq!(function.callbacks.len(), 2);
@@ -80,8 +80,8 @@ fn test_callbacks_vec() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 0);
     assert_eq!(function.callbacks.len(), 1);
@@ -117,8 +117,8 @@ fn test_callbacks_mixed_with_params() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 2);
     assert_eq!(function.callbacks.len(), 2);

diff --git a/integration-tests/tests/abi/e2e.rs b/integration-tests/tests/abi/e2e.rs
@@ -12,7 +12,7 @@ fn test_simple_function() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
+    assert_eq!(abi_root.body.functions.len(), 2);
     let function = &abi_root.body.functions[0];
     let u32_schema = SchemaGenerator::default().subschema_for::<u32>();
     assert_eq!(