Arin Turpin hace 6 años
padre
commit
87e35a8443
Se han modificado 19 ficheros con 146 adiciones y 129 borrados
  1. 146
    129
      .idea/workspace.xml
  2. BIN
      ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/.DS_Store
  3. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/BlockController.class
  4. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/TransactionController.class
  5. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/WalletController.class
  6. 0
    0
      ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Chain.class
  7. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Transaction.class
  8. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Wallet.class
  9. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/TransactionRepository.class
  10. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/WalletRepository.class
  11. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/Miner.class
  12. BIN
      ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/StringUtil.class
  13. BIN
      ZipCoinRedJavaServer/target/test-classes/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.class
  14. BIN
      ZipCoinRedJavaServer/target/test-classes/com/zipcoin/redCoin/chain/test/chainTest.class
  15. BIN
      ZipCoinRedJavaServer/target/test-classes/com/zipcoin/redCoin/miner/test/minerTest.class
  16. BIN
      target/classes/com/zipcoin/controllers/BlockController.class
  17. BIN
      target/classes/com/zipcoin/model/Miner.class
  18. BIN
      target/test-classes/redCoin/Miner/minerTest.class
  19. BIN
      target/test-classes/redCoin/chainTest.class

+ 146
- 129
.idea/workspace.xml Ver fichero

@@ -27,20 +27,29 @@
27 27
   </component>
28 28
   <component name="FileEditorManager">
29 29
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30
-      <file leaf-file-name="Chain.java" pinned="false" current-in-tab="false">
31
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Chain.java">
30
+      <file leaf-file-name="TransactionAndWalletTest.java" pinned="false" current-in-tab="true">
31
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java">
32 32
           <provider selected="true" editor-type-id="text-editor">
33
-            <state relative-caret-position="60">
34
-              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
33
+            <state relative-caret-position="91">
34
+              <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
35
+            </state>
36
+          </provider>
37
+        </entry>
38
+      </file>
39
+      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
40
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
41
+          <provider selected="true" editor-type-id="text-editor">
42
+            <state relative-caret-position="-483">
43
+              <caret column="1" lean-forward="true" selection-start-column="1" selection-end-column="1" />
35 44
             </state>
36 45
           </provider>
37 46
         </entry>
38 47
       </file>
39
-      <file leaf-file-name="chainTest.java" pinned="false" current-in-tab="true">
40
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/chain/test/chainTest.java">
48
+      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
49
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
41 50
           <provider selected="true" editor-type-id="text-editor">
42
-            <state relative-caret-position="90">
43
-              <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
51
+            <state relative-caret-position="60">
52
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
44 53
             </state>
45 54
           </provider>
46 55
         </entry>
@@ -77,6 +86,9 @@
77 86
         <option value="$PROJECT_DIR$/src/test/java/redCoin/Miner/minerTest.java" />
78 87
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java" />
79 88
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/chain/test/chainTest.java" />
89
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java" />
90
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java" />
91
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Chain.java" />
80 92
       </list>
81 93
     </option>
82 94
   </component>
@@ -102,11 +114,10 @@
102 114
   <component name="NodePackageJsonFileManager">
103 115
     <packageJsonPaths />
104 116
   </component>
105
-  <component name="ProjectFrameBounds" extendedState="6">
106
-    <option name="x" value="647" />
107
-    <option name="y" value="75" />
108
-    <option name="width" value="633" />
109
-    <option name="height" value="649" />
117
+  <component name="ProjectFrameBounds">
118
+    <option name="y" value="22" />
119
+    <option name="width" value="1280" />
120
+    <option name="height" value="702" />
110 121
   </component>
111 122
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
112 123
     <ConfirmationsSetting value="2" id="Add" />
@@ -116,7 +127,8 @@
116 127
       <foldersAlwaysOnTop value="true" />
117 128
     </navigator>
118 129
     <panes>
119
-      <pane id="AndroidView" />
130
+      <pane id="PackagesPane" />
131
+      <pane id="Scope" />
120 132
       <pane id="ProjectPane">
121 133
         <subPane>
122 134
           <expand>
@@ -157,48 +169,12 @@
157 169
               <item name="main" type="462c0819:PsiDirectoryNode" />
158 170
               <item name="java" type="462c0819:PsiDirectoryNode" />
159 171
               <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
160
-              <item name="config" type="462c0819:PsiDirectoryNode" />
161
-            </path>
162
-            <path>
163
-              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
164
-              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
165
-              <item name="src" type="462c0819:PsiDirectoryNode" />
166
-              <item name="main" type="462c0819:PsiDirectoryNode" />
167
-              <item name="java" type="462c0819:PsiDirectoryNode" />
168
-              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
169
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
170
-            </path>
171
-            <path>
172
-              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
173
-              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
174
-              <item name="src" type="462c0819:PsiDirectoryNode" />
175
-              <item name="main" type="462c0819:PsiDirectoryNode" />
176
-              <item name="java" type="462c0819:PsiDirectoryNode" />
177
-              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
178 172
               <item name="model" type="462c0819:PsiDirectoryNode" />
179 173
             </path>
180 174
             <path>
181 175
               <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
182 176
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
183 177
               <item name="src" type="462c0819:PsiDirectoryNode" />
184
-              <item name="main" type="462c0819:PsiDirectoryNode" />
185
-              <item name="java" type="462c0819:PsiDirectoryNode" />
186
-              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
187
-              <item name="repository" type="462c0819:PsiDirectoryNode" />
188
-            </path>
189
-            <path>
190
-              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
191
-              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
192
-              <item name="src" type="462c0819:PsiDirectoryNode" />
193
-              <item name="main" type="462c0819:PsiDirectoryNode" />
194
-              <item name="java" type="462c0819:PsiDirectoryNode" />
195
-              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
196
-              <item name="utilities" type="462c0819:PsiDirectoryNode" />
197
-            </path>
198
-            <path>
199
-              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
200
-              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
201
-              <item name="src" type="462c0819:PsiDirectoryNode" />
202 178
               <item name="test" type="462c0819:PsiDirectoryNode" />
203 179
             </path>
204 180
             <path>
@@ -223,14 +199,13 @@
223 199
               <item name="test" type="462c0819:PsiDirectoryNode" />
224 200
               <item name="java" type="462c0819:PsiDirectoryNode" />
225 201
               <item name="redCoin" type="462c0819:PsiDirectoryNode" />
226
-              <item name="test" type="462c0819:PsiDirectoryNode" />
202
+              <item name="TransactionAndWallet" type="462c0819:PsiDirectoryNode" />
227 203
             </path>
228 204
           </expand>
229 205
           <select />
230 206
         </subPane>
231 207
       </pane>
232
-      <pane id="Scope" />
233
-      <pane id="PackagesPane" />
208
+      <pane id="AndroidView" />
234 209
       <pane id="Course" />
235 210
     </panes>
236 211
   </component>
@@ -271,7 +246,29 @@
271 246
       </list>
272 247
     </option>
273 248
   </component>
274
-  <component name="RunManager" selected="Unknown.ZipCoinApp882246340">
249
+  <component name="RunManager" selected="Application.TransactionAndWalletTest">
250
+    <configuration name="TransactionAndWalletTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
251
+      <option name="MAIN_CLASS_NAME" value="com.zipcoin.redCoin.TransactionAndWallet.TransactionAndWalletTest" />
252
+      <module name="ZipCoin-RED" />
253
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
254
+      <extension name="coverage">
255
+        <pattern>
256
+          <option name="PATTERN" value="com.zipcoin.redCoin.TransactionAndWallet.*" />
257
+          <option name="ENABLED" value="true" />
258
+        </pattern>
259
+      </extension>
260
+    </configuration>
261
+    <configuration name="ZipCoinApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
262
+      <option name="MAIN_CLASS_NAME" value="com.zipcoin.ZipCoinApp" />
263
+      <module name="ZipCoin-RED" />
264
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
265
+      <extension name="coverage">
266
+        <pattern>
267
+          <option name="PATTERN" value="com.zipcoin.*" />
268
+          <option name="ENABLED" value="true" />
269
+        </pattern>
270
+      </extension>
271
+    </configuration>
275 272
     <configuration default="true" type="Application" factoryName="Application">
276 273
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
277 274
     </configuration>
@@ -355,16 +352,6 @@
355 352
       </option>
356 353
       <patterns />
357 354
     </configuration>
358
-    <configuration name="ZipCoinApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
359
-      <module name="ZipCoin-RED" />
360
-      <extension name="coverage">
361
-        <pattern>
362
-          <option name="PATTERN" value="com.zipcoin.*" />
363
-          <option name="ENABLED" value="true" />
364
-        </pattern>
365
-      </extension>
366
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.zipcoin.ZipCoinApp" />
367
-    </configuration>
368 355
     <configuration default="true" type="TestNG" factoryName="TestNG">
369 356
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
370 357
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -391,9 +378,13 @@
391 378
       <item itemvalue="JUnit.testMain.test" />
392 379
       <item itemvalue="JUnit.java in ZipCoin-RED" />
393 380
       <item itemvalue="JUnit.minerTest" />
381
+      <item itemvalue="Application.ZipCoinApp" />
382
+      <item itemvalue="Application.TransactionAndWalletTest" />
394 383
     </list>
395 384
     <recent_temporary>
396 385
       <list>
386
+        <item itemvalue="Application.TransactionAndWalletTest" />
387
+        <item itemvalue="Application.ZipCoinApp" />
397 388
         <item itemvalue="JUnit.java in ZipCoin-RED" />
398 389
         <item itemvalue="JUnit.minerTest" />
399 390
         <item itemvalue="JUnit.testMain.test" />
@@ -405,7 +396,7 @@
405 396
   </component>
406 397
   <component name="TaskManager">
407 398
     <task active="true" id="Default" summary="Default task">
408
-      <changelist id="f54e258d-da71-464b-8271-7897ae55d27f" name="Default" comment="" />
399
+      <changelist id="2f74b7b2-2ea5-4123-a0c8-46294ab149b0" name="Default" comment="" />
409 400
       <created>1531343031636</created>
410 401
       <option name="number" value="Default" />
411 402
       <option name="presentableId" value="Default" />
@@ -453,89 +444,69 @@
453 444
     <option name="totallyTimeSpent" value="18185000" />
454 445
   </component>
455 446
   <component name="ToolWindowManager">
456
-    <frame x="0" y="22" width="1280" height="699" extended-state="6" />
447
+    <frame x="0" y="22" width="1280" height="702" extended-state="6" />
457 448
     <editor active="true" />
458 449
     <layout>
459 450
       <window_info anchor="right" id="Palette" order="3" />
460 451
       <window_info anchor="bottom" id="TODO" order="6" />
461
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.32608697" />
452
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
462 453
       <window_info anchor="right" id="Palette&#9;" order="3" />
463 454
       <window_info id="Image Layers" order="2" />
464 455
       <window_info anchor="right" id="Capture Analysis" order="3" />
465
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5016155" side_tool="true" weight="0.6710963" />
456
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
466 457
       <window_info anchor="right" id="Maven Projects" order="3" weight="0.32956383" />
458
+      <window_info anchor="bottom" id="Run" order="2" weight="0.0" />
467 459
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
468
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3305648" />
469
-      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4983845" visible="true" weight="0.3538206" />
460
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.009917355" />
470 461
       <window_info id="Capture Tool" order="2" />
471 462
       <window_info id="Designer" order="2" />
472
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3029079" />
463
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27705976" />
473 464
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
474 465
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
475 466
       <window_info id="UI Designer" order="2" />
476 467
       <window_info anchor="right" id="Theme Preview" order="3" />
477
-      <window_info id="Favorites" order="2" side_tool="true" />
478 468
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
479
-      <window_info id="Designer" order="2" />
480
-      <window_info anchor="right" id="Palette" order="3" />
481
-      <window_info anchor="bottom" id="Run" order="2" weight="0.54206896" />
469
+      <window_info id="Favorites" order="2" side_tool="true" />
482 470
       <window_info anchor="bottom" id="Spring" order="9" />
483
-      <window_info id="Image Layers" order="2" />
471
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
484 472
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
473
+      <window_info anchor="bottom" id="Message" order="0" />
474
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
485 475
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
486
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
487
-      <window_info id="UI Designer" order="2" />
488
-      <window_info id="Favorites" order="2" side_tool="true" />
489
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32827586" />
490
-      <window_info id="Capture Tool" order="2" />
491
-      <window_info anchor="right" id="Capture Analysis" order="3" />
492
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
493
-      <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
494
-      <window_info anchor="bottom" id="TODO" order="6" />
476
+      <window_info id="Web" order="4" side_tool="true" />
477
+      <window_info id="Learn" order="5" />
478
+      <window_info anchor="right" id="Bean Validation" order="4" />
479
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
495 480
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
496
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.273021" />
497 481
       <window_info anchor="bottom" id="Java Enterprise" order="8" />
498
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
499
-      <window_info anchor="bottom" id="Version Control" order="7" />
500
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.32956383" />
501
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
502
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
503
-      <window_info id="Learn" order="5" />
504 482
       <window_info anchor="right" id="Database" order="3" />
505
-      <window_info anchor="bottom" id="Message" order="0" />
506
-      <window_info id="Web" order="4" side_tool="true" />
507
-      <window_info anchor="right" id="Palette&#9;" order="3" />
508
-      <window_info anchor="right" id="Theme Preview" order="3" />
509
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
510
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
511
-      <window_info anchor="right" id="Bean Validation" order="4" />
512 483
     </layout>
513 484
     <layout-to-restore>
514 485
       <window_info anchor="right" id="Palette" order="3" />
486
+      <window_info anchor="bottom" id="Message" order="0" />
515 487
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
516 488
       <window_info anchor="right" id="Capture Analysis" order="4" />
517
-      <window_info anchor="right" id="Database" order="6" />
518
-      <window_info anchor="bottom" id="Version Control" order="10" />
489
+      <window_info anchor="bottom" id="Run" order="2" />
519 490
       <window_info anchor="right" id="Theme Preview" order="5" />
491
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
520 492
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2358643" />
521 493
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
522 494
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
523 495
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
524 496
       <window_info anchor="bottom" id="TODO" order="6" />
525
-      <window_info anchor="bottom" id="Run" order="2" />
526 497
       <window_info id="Image Layers" order="2" />
527 498
       <window_info id="Designer" order="3" />
528
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
529 499
       <window_info id="UI Designer" order="4" />
530
-      <window_info anchor="bottom" id="Find" order="1" />
531
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
500
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
501
+      <window_info anchor="right" id="Database" order="6" />
532 502
       <window_info anchor="right" id="Palette&#9;" order="7" />
533 503
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49919224" weight="0.65384614" />
534
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50080776" side_tool="true" weight="0.30936456" />
504
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
535 505
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
536
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
506
+      <window_info anchor="bottom" id="Version Control" order="10" />
507
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50080776" side_tool="true" weight="0.30936456" />
537 508
       <window_info id="Capture Tool" order="5" />
538
-      <window_info anchor="bottom" id="Message" order="0" />
509
+      <window_info anchor="bottom" id="Find" order="1" />
539 510
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32674298" />
540 511
       <window_info anchor="right" id="Maven Projects" order="8" weight="0.32956383" />
541 512
       <window_info id="Favorites" order="6" side_tool="true" />
@@ -553,15 +524,6 @@
553 524
     </breakpoint-manager>
554 525
   </component>
555 526
   <component name="editorHistoryManager">
556
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
557
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
558
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
559
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
560
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
561
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
562
-    <entry file="file://$PROJECT_DIR$/pom.xml" />
563
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
564
-    <entry file="file://$PROJECT_DIR$/ZipCoin-RED.iml" />
565 527
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/block/test/BlockControllerTest.java" />
566 528
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
567 529
       <provider selected="true" editor-type-id="text-editor">
@@ -616,13 +578,6 @@
616 578
         </state>
617 579
       </provider>
618 580
     </entry>
619
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/ZipCoinApp.java">
620
-      <provider selected="true" editor-type-id="text-editor">
621
-        <state relative-caret-position="230">
622
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
623
-        </state>
624
-      </provider>
625
-    </entry>
626 581
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Miner.java" />
627 582
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/BlockRepository.java">
628 583
       <provider selected="true" editor-type-id="text-editor">
@@ -638,24 +593,86 @@
638 593
         </state>
639 594
       </provider>
640 595
     </entry>
596
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/chain/test/chainTest.java">
597
+      <provider selected="true" editor-type-id="text-editor">
598
+        <state relative-caret-position="90">
599
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
600
+        </state>
601
+      </provider>
602
+    </entry>
641 603
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java">
642 604
       <provider selected="true" editor-type-id="text-editor">
643
-        <state relative-caret-position="-37">
644
-          <caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
605
+        <state relative-caret-position="690">
606
+          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
607
+        </state>
608
+      </provider>
609
+    </entry>
610
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/ZipCoinApp.java">
611
+      <provider selected="true" editor-type-id="text-editor">
612
+        <state relative-caret-position="32">
613
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
614
+        </state>
615
+      </provider>
616
+    </entry>
617
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.3.1.RELEASE/spring-boot-1.3.1.RELEASE.jar!/org/springframework/boot/SpringApplication.class">
618
+      <provider selected="true" editor-type-id="text-editor">
619
+        <state>
620
+          <caret line="692" selection-start-line="692" selection-end-line="692" />
621
+        </state>
622
+      </provider>
623
+    </entry>
624
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
625
+      <provider selected="true" editor-type-id="text-editor" />
626
+    </entry>
627
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
628
+      <provider selected="true" editor-type-id="text-editor">
629
+        <state relative-caret-position="240">
630
+          <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
645 631
         </state>
646 632
       </provider>
647 633
     </entry>
648 634
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Chain.java">
649 635
       <provider selected="true" editor-type-id="text-editor">
636
+        <state relative-caret-position="315">
637
+          <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
638
+        </state>
639
+      </provider>
640
+    </entry>
641
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
642
+      <provider selected="true" editor-type-id="text-editor">
650 643
         <state relative-caret-position="60">
651 644
           <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
652 645
         </state>
653 646
       </provider>
654 647
     </entry>
655
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/chain/test/chainTest.java">
648
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql">
649
+      <provider selected="true" editor-type-id="text-editor" />
650
+    </entry>
651
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/block/test/BlockTest.java">
656 652
       <provider selected="true" editor-type-id="text-editor">
657
-        <state relative-caret-position="90">
658
-          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
653
+        <state relative-caret-position="308">
654
+          <caret line="32" column="5" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
655
+        </state>
656
+      </provider>
657
+    </entry>
658
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Block.java">
659
+      <provider selected="true" editor-type-id="text-editor">
660
+        <state relative-caret-position="75">
661
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
662
+        </state>
663
+      </provider>
664
+    </entry>
665
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
666
+      <provider selected="true" editor-type-id="text-editor">
667
+        <state relative-caret-position="-483">
668
+          <caret column="1" lean-forward="true" selection-start-column="1" selection-end-column="1" />
669
+        </state>
670
+      </provider>
671
+    </entry>
672
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java">
673
+      <provider selected="true" editor-type-id="text-editor">
674
+        <state relative-caret-position="91">
675
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
659 676
         </state>
660 677
       </provider>
661 678
     </entry>

BIN
ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/.DS_Store Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/BlockController.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/TransactionController.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/WalletController.class Ver fichero


target/classes/com/zipcoin/model/Chain.class → ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Chain.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Transaction.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Wallet.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/TransactionRepository.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/WalletRepository.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/Miner.class Ver fichero


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/StringUtil.class Ver fichero


BIN
ZipCoinRedJavaServer/target/test-classes/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.class Ver fichero


BIN
ZipCoinRedJavaServer/target/test-classes/com/zipcoin/redCoin/chain/test/chainTest.class Ver fichero


BIN
ZipCoinRedJavaServer/target/test-classes/com/zipcoin/redCoin/miner/test/minerTest.class Ver fichero


BIN
target/classes/com/zipcoin/controllers/BlockController.class Ver fichero


BIN
target/classes/com/zipcoin/model/Miner.class Ver fichero


BIN
target/test-classes/redCoin/Miner/minerTest.class Ver fichero


BIN
target/test-classes/redCoin/chainTest.class Ver fichero