From 034bcca713e95c8ccdf81c2cc6bba5cfd9ec27d9 Mon Sep 17 00:00:00 2001
From: saintdi25u <corentinstd@gmail.com>
Date: Mon, 4 Mar 2024 23:53:41 +0100
Subject: [PATCH] correction merge : j'espere que tout marche
---
src/main/java/fr/miage/Blockchain.java | 18 +++++++-------
src/main/java/fr/miage/blocs/Bloc.java | 24 ++++++++++---------
src/main/java/fr/miage/threads/Mineur.java | 6 -----
.../default-testCompile/inputFiles.lst | 0
4 files changed, 22 insertions(+), 26 deletions(-)
delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/src/main/java/fr/miage/Blockchain.java b/src/main/java/fr/miage/Blockchain.java
index 8873a11..35b663b 100644
--- a/src/main/java/fr/miage/Blockchain.java
+++ b/src/main/java/fr/miage/Blockchain.java
@@ -49,15 +49,15 @@ public class Blockchain {
double amountWalletSender = walletSender.getUtxos().stream().mapToDouble(utxo -> utxo.getMontant()).sum();
double randomAmountToSend = new Random().nextDouble(amountWalletSender);
- System.out.println("Amount to send : " + randomAmountToSend);
- System.out.println("Envoie de " + walletSender.getName() + " à " +
- walletReceiver.getName());
- System.out.println();
- System.out.println("Utxos de " + walletSender.getName() + " : " +
- walletSender.getUtxos());
- System.out.println("Utxos de " + walletReceiver.getName() + " : " +
- walletReceiver.getUtxos());
- System.out.println();
+ // System.out.println("Amount to send : " + randomAmountToSend);
+ // System.out.println("Envoie de " + walletSender.getName() + " à " +
+ // walletReceiver.getName());
+ // System.out.println();
+ // System.out.println("Utxos de " + walletSender.getName() + " : " +
+ // walletSender.getUtxos());
+ // System.out.println("Utxos de " + walletReceiver.getName() + " : " +
+ // walletReceiver.getUtxos());
+ // System.out.println();
if (walletSender.getUtxos().isEmpty() || walletReceiver.getUtxos().isEmpty()) {
System.out.println("Wallets vides");
return;
diff --git a/src/main/java/fr/miage/blocs/Bloc.java b/src/main/java/fr/miage/blocs/Bloc.java
index 4a039ea..a55e7a4 100644
--- a/src/main/java/fr/miage/blocs/Bloc.java
+++ b/src/main/java/fr/miage/blocs/Bloc.java
@@ -93,17 +93,19 @@ public class Bloc {
return new Bloc(hash, transactions);
}
- BlocHeader blocHeader = new BlocHeader("", Instant.now().toEpochMilli(), 0);
- String header = blocHeader.toString();
- String hash = generateHash(header, transactions);return new Bloc(hash,transactions);
-}
-
- public static Bloc createBloc(List<Transaction> transactions, String previousHash) {
- BlocHeader blocHeader = new BlocHeader(previousHash, Instant.now().toEpochMilli(), 0);
- String header = blocHeader.toString();
- String hash = generateHash(header, transactions);
- return new Bloc(hash, transactions);
- }
+ // BlocHeader blocHeader = new BlocHeader("", Instant.now().toEpochMilli(), 0);
+ // String header = blocHeader.toString();
+ // String hash = generateHash(header, transactions);return new
+ // Bloc(hash,transactions);
+
+ // public static Bloc createBloc(List<Transaction> transactions, String
+ // previousHash) {
+ // BlocHeader blocHeader = new BlocHeader(previousHash,
+ // Instant.now().toEpochMilli(), 0);
+ // String header = blocHeader.toString();
+ // String hash = generateHash(header, transactions);
+ // return new Bloc(hash, transactions);
+ // }
private static String generateHash(String header, List<Transaction> transactions) {
return DigestUtils.sha256Hex(header + transactions.toString());
diff --git a/src/main/java/fr/miage/threads/Mineur.java b/src/main/java/fr/miage/threads/Mineur.java
index 51b47ff..5d930a6 100644
--- a/src/main/java/fr/miage/threads/Mineur.java
+++ b/src/main/java/fr/miage/threads/Mineur.java
@@ -1,9 +1,6 @@
package fr.miage.threads;
-<<<<<<< HEAD
import java.security.NoSuchAlgorithmException;
-=======
->>>>>>> bbecea85ece93e9327a7cf897cc7bc8973d7bee6
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -11,10 +8,7 @@ import java.util.List;
import fr.miage.Blockchain;
import fr.miage.MinageManager;
import fr.miage.Transaction;
-<<<<<<< HEAD
import fr.miage.Wallet;
-=======
->>>>>>> bbecea85ece93e9327a7cf897cc7bc8973d7bee6
import fr.miage.blocs.Bloc;
public class Mineur extends Thread {
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000
--
GitLab