Removed single-process POW support, which was just needed on Windows
This commit is contained in:
		
							parent
							
								
									ac279c1cef
								
							
						
					
					
						commit
						8b5c87d356
					
				
					 4 changed files with 16 additions and 36 deletions
				
			
		|  | @ -23,7 +23,7 @@ import filepaths | |||
| DENIABLE_PEER_ADDRESS = "OVPCZLOXD6DC5JHX4EQ3PSOGAZ3T24F75HQLIUZSDSMYPEOXCPFA" | ||||
| PASSWORD_LENGTH = 25 | ||||
| ONIONR_TAGLINE = 'Private P2P Communication - GPLv3 - https://Onionr.net' | ||||
| ONIONR_VERSION = '4.0.0' | ||||
| ONIONR_VERSION = '5.0.0' | ||||
| ONIONR_VERSION_CODENAME = 'Genesis' | ||||
| ONIONR_VERSION_TUPLE = tuple(ONIONR_VERSION.split('.')) # (MAJOR, MINOR, VERSION) | ||||
| API_VERSION = '1' # increments of 1; only change when something fundamental about how the API works changes. This way other nodes know how to communicate without learning too much information about you. | ||||
|  |  | |||
|  | @ -1,27 +0,0 @@ | |||
| ''' | ||||
|     Onionr - Private P2P Communication | ||||
| 
 | ||||
|     This file does determinations for what proof of work module should be used | ||||
| ''' | ||||
| ''' | ||||
|     This program is free software: you can redistribute it and/or modify | ||||
|     it under the terms of the GNU General Public License as published by | ||||
|     the Free Software Foundation, either version 3 of the License, or | ||||
|     (at your option) any later version. | ||||
| 
 | ||||
|     This program is distributed in the hope that it will be useful, | ||||
|     but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|     GNU General Public License for more details. | ||||
| 
 | ||||
|     You should have received a copy of the GNU General Public License | ||||
|     along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
| ''' | ||||
| import platform | ||||
| def use_subprocess(config_inst): | ||||
|     use = True | ||||
|     if not config_inst.get('general.use_subprocess_pow_if_possible', True): | ||||
|         use = False | ||||
|     if 'Windows' == platform.system(): | ||||
|         use = False | ||||
|     return use | ||||
|  | @ -12,14 +12,13 @@ import filepaths | |||
| import onionrstorage | ||||
| from .. import storagecounter | ||||
| from onionrplugins import onionrevents as events | ||||
| from etc import powchoice, onionrvalues | ||||
| from etc import onionrvalues | ||||
| import config | ||||
| import onionrcrypto as crypto | ||||
| import onionrexceptions | ||||
| from onionrusers import onionrusers | ||||
| from onionrutils import localcommand, blockmetadata, stringvalidators | ||||
| import coredb | ||||
| import onionrproofs | ||||
| from onionrproofs import subprocesspow | ||||
| import logger | ||||
| from onionrtypes import UserIDSecretKey | ||||
|  | @ -87,8 +86,6 @@ def insert_block(data: Union[str, bytes], header: str = 'txt', | |||
|         our_pub_key = bytesconverter.bytes_to_str( | ||||
|             crypto.cryptoutils.get_pub_key_from_priv(our_private_key)) | ||||
| 
 | ||||
|     use_subprocess = powchoice.use_subprocess(config) | ||||
| 
 | ||||
|     retData = False | ||||
| 
 | ||||
|     if type(data) is None: | ||||
|  | @ -208,10 +205,7 @@ def insert_block(data: Union[str, bytes], header: str = 'txt', | |||
|         metadata['expire'] = expire | ||||
| 
 | ||||
|     # send block data (and metadata) to POW module to get tokenized block data | ||||
|     if use_subprocess: | ||||
|         payload = subprocesspow.SubprocessPOW(data, metadata).start() | ||||
|     else: | ||||
|         payload = onionrproofs.POW(metadata, data).waitForResult() | ||||
|     payload = subprocesspow.SubprocessPOW(data, metadata).start() | ||||
|     if payload != False:  # noqa | ||||
|         try: | ||||
|             retData = onionrstorage.set_data(payload) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue