11912702641

Committed 19 Nov 2024 12:08PM UTC coverage: 74.07% (+0.001%) from 74.069%

Build # 11912702641

Build Type

push

github

Committed by

web-flow

Commit Message

nullable Storage.Get; refactor TokenContract (#1214)

* nullable Storage.Get

* revert operator BigInteger(ByteString

* optimize framework contracts

* optimize IsValid for UInt160 & UInt256

* cancel is null with isValid

* cancel unnecessary pragma annotation

* update artifacts

* update gas

* update last gas

* Merge branch 'master' into pr/1214

# Conflicts:
#	tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Linq.cs
#	tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_NEP11.cs
#	tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_NEP17.cs
#	tests/Neo.SmartContract.Framework.UnitTests/TestingArtifacts/Contract_SupportedStandard11Enum.cs
#	tests/Neo.SmartContract.Framework.UnitTests/TestingArtifacts/Contract_SupportedStandard17Enum.cs
#	tests/Neo.SmartContract.Template.UnitTests/templates/neocontractnep17/TestingArtifacts/Nep17ContractTemplate.artifacts.cs
#	tests/Neo.SmartContract.Template.UnitTests/templates/neocontractowner/TestingArtifacts/OwnableTemplate.artifacts.cs

* revert IsValid

* Remove comments in UInt256.cs

* Remove comments in UInt160.cs

* revert TokenContract

* update artifacts

---------

Co-authored-by: Jimmy <jimmy@r3e.network>
Co-authored-by: Shargon <shargon@gmail.com>

Run Details

4877 of 7180 branches covered (67.92%)

Branch coverage included in aggregate %.

1 of 16 new or added lines in 6 files covered. (6.25%)

1 existing line in 1 file now uncovered.

13065 of 17043 relevant lines covered (76.66%)

18490.18 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/Neo.SmartContract.Framework/Services/Storage.cs

// Copyright (C) 2015-2024 The Neo Project.
// 
// The Neo.SmartContract.Framework is free software distributed under the MIT 
// software license, see the accompanying file LICENSE in the main directory 
// of the project or http://www.opensource.org/licenses/mit-license.php 
// for more details.
// 
// Redistribution and use in source and binary forms with or without
// modifications are permitted.

using Neo.SmartContract.Framework.Attributes;
using System.Numerics;

namespace Neo.SmartContract.Framework.Services
{
    public static class Storage
    {
        /// <summary>
        /// Returns current StorageContext
        /// </summary>
        public static extern StorageContext CurrentContext
        {
            [Syscall("System.Storage.GetContext")]
            get;
        }

        /// <summary>
        /// Returns current read only StorageContext
        /// </summary>
        public static extern StorageContext CurrentReadOnlyContext
        {
            [Syscall("System.Storage.GetReadOnlyContext")]
            get;
        }

        /// <summary>
        /// Returns the value corresponding to the given key for Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Get")]
        public static extern ByteString? Get(StorageContext context, ByteString key);

        /// <summary>
        /// Returns the value corresponding to the given key for Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Get")]
        public static extern ByteString? Get(StorageContext context, byte[] key);

        /// <summary>
        /// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Put")]
        public static extern void Put(StorageContext context, ByteString key, ByteString value);

        /// <summary>
        /// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Put")]
        public static extern void Put(StorageContext context, byte[] key, ByteString value);

        /// <summary>
        /// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Put")]
        public static extern void Put(StorageContext context, byte[] key, byte[] value);

        /// <summary>
        /// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Put")]
        public static extern void Put(StorageContext context, ByteString key, BigInteger value);

        /// <summary>
        /// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Put")]
        public static extern void Put(StorageContext context, byte[] key, BigInteger value);

        /// <summary>
        /// Deletes the entry from the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Delete")]
        public static extern void Delete(StorageContext context, ByteString key);

        /// <summary>
        /// Deletes the entry from the given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Delete")]
        public static extern void Delete(StorageContext context, byte[] key);

        /// <summary>
        /// Returns a byte[] to byte[] iterator for a byte[] prefix on a given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Find")]
        public static extern Iterator Find(StorageContext context, ByteString prefix, FindOptions options = FindOptions.None);

        /// <summary>
        /// Returns a byte[] to byte[] iterator for a byte[] prefix on a given Storage context (faster: generates opcode directly)
        /// </summary>
        [Syscall("System.Storage.Find")]
        public static extern Iterator Find(StorageContext context, byte[] prefix, FindOptions options = FindOptions.None);

        #region Interface with default Context
        public static ByteString? Get(ByteString key) => Get(CurrentReadOnlyContext, key);
        public static ByteString? Get(byte[] key) => Get(CurrentReadOnlyContext, key);
        public static void Put(ByteString key, ByteString value) => Put(CurrentContext, key, value);
        public static void Put(byte[] key, ByteString value) => Put(CurrentContext, key, value);
        public static void Put(byte[] key, byte[] value) => Put(CurrentContext, key, value);
        public static void Put(ByteString key, BigInteger value) => Put(CurrentContext, key, value);
        public static void Put(byte[] key, BigInteger value) => Put(CurrentContext, key, value);
        public static void Delete(ByteString key) => Delete(CurrentContext, key);
        public static void Delete(byte[] key) => Delete(CurrentContext, key);
        public static Iterator Find(ByteString prefix, FindOptions options = FindOptions.None) => Find(CurrentReadOnlyContext, prefix, options);
        public static Iterator Find(byte[] prefix, FindOptions options = FindOptions.None) => Find(CurrentReadOnlyContext, prefix, options);
        #endregion
    }
}

1	// Copyright (C) 2015-2024 The Neo Project.
2	//
3	// The Neo.SmartContract.Framework is free software distributed under the MIT
4	// software license, see the accompanying file LICENSE in the main directory
5	// of the project or http://www.opensource.org/licenses/mit-license.php
6	// for more details.
7	//
8	// Redistribution and use in source and binary forms with or without
9	// modifications are permitted.
10
11	using Neo.SmartContract.Framework.Attributes;
12	using System.Numerics;
13
14	namespace Neo.SmartContract.Framework.Services
15	{
16	public static class Storage
17	{
18	/// <summary>
19	/// Returns current StorageContext
20	/// </summary>
21	public static extern StorageContext CurrentContext
22	{
23	[Syscall("System.Storage.GetContext")]
24	get;
25	}
26
27	/// <summary>
28	/// Returns current read only StorageContext
29	/// </summary>
30	public static extern StorageContext CurrentReadOnlyContext
31	{
32	[Syscall("System.Storage.GetReadOnlyContext")]
33	get;
34	}
35
36	/// <summary>
37	/// Returns the value corresponding to the given key for Storage context (faster: generates opcode directly)
38	/// </summary>
39	[Syscall("System.Storage.Get")]
40	public static extern ByteString? Get(StorageContext context, ByteString key);
41
42	/// <summary>
43	/// Returns the value corresponding to the given key for Storage context (faster: generates opcode directly)
44	/// </summary>
45	[Syscall("System.Storage.Get")]
46	public static extern ByteString? Get(StorageContext context, byte[] key);
47
48	/// <summary>
49	/// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
50	/// </summary>
51	[Syscall("System.Storage.Put")]
52	public static extern void Put(StorageContext context, ByteString key, ByteString value);
53
54	/// <summary>
55	/// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
56	/// </summary>
57	[Syscall("System.Storage.Put")]
58	public static extern void Put(StorageContext context, byte[] key, ByteString value);
59
60	/// <summary>
61	/// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
62	/// </summary>
63	[Syscall("System.Storage.Put")]
64	public static extern void Put(StorageContext context, byte[] key, byte[] value);
65
66	/// <summary>
67	/// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
68	/// </summary>
69	[Syscall("System.Storage.Put")]
70	public static extern void Put(StorageContext context, ByteString key, BigInteger value);
71
72	/// <summary>
73	/// Writes the key/value pair for the given Storage context (faster: generates opcode directly)
74	/// </summary>
75	[Syscall("System.Storage.Put")]
76	public static extern void Put(StorageContext context, byte[] key, BigInteger value);
77
78	/// <summary>
79	/// Deletes the entry from the given Storage context (faster: generates opcode directly)
80	/// </summary>
81	[Syscall("System.Storage.Delete")]
82	public static extern void Delete(StorageContext context, ByteString key);
83
84	/// <summary>
85	/// Deletes the entry from the given Storage context (faster: generates opcode directly)
86	/// </summary>
87	[Syscall("System.Storage.Delete")]
88	public static extern void Delete(StorageContext context, byte[] key);
89
90	/// <summary>
91	/// Returns a byte[] to byte[] iterator for a byte[] prefix on a given Storage context (faster: generates opcode directly)
92	/// </summary>
93	[Syscall("System.Storage.Find")]
94	public static extern Iterator Find(StorageContext context, ByteString prefix, FindOptions options = FindOptions.None);
95
96	/// <summary>
97	/// Returns a byte[] to byte[] iterator for a byte[] prefix on a given Storage context (faster: generates opcode directly)
98	/// </summary>
99	[Syscall("System.Storage.Find")]
100	public static extern Iterator Find(StorageContext context, byte[] prefix, FindOptions options = FindOptions.None);
101
102	#region Interface with default Context
NEW 103	public static ByteString? Get(ByteString key) => Get(CurrentReadOnlyContext, key);	×
NEW 104	public static ByteString? Get(byte[] key) => Get(CurrentReadOnlyContext, key);	×
105	public static void Put(ByteString key, ByteString value) => Put(CurrentContext, key, value);	×
106	public static void Put(byte[] key, ByteString value) => Put(CurrentContext, key, value);	×
107	public static void Put(byte[] key, byte[] value) => Put(CurrentContext, key, value);	×
108	public static void Put(ByteString key, BigInteger value) => Put(CurrentContext, key, value);	×
109	public static void Put(byte[] key, BigInteger value) => Put(CurrentContext, key, value);	×
110	public static void Delete(ByteString key) => Delete(CurrentContext, key);	×
111	public static void Delete(byte[] key) => Delete(CurrentContext, key);	×
112	public static Iterator Find(ByteString prefix, FindOptions options = FindOptions.None) => Find(CurrentReadOnlyContext, prefix, options);	×
113	public static Iterator Find(byte[] prefix, FindOptions options = FindOptions.None) => Find(CurrentReadOnlyContext, prefix, options);	×
114	#endregion
115	}
116	}

neo-project / neo-devpack-dotnet / 11912702641

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous