Skip to content
This repository was archived by the owner on Feb 4, 2022. It is now read-only.

Commit 742ad42

Browse files
committed
Fix analysis warnings in Dart 2.14
1 parent 3889857 commit 742ad42

14 files changed

+30
-21
lines changed

example/contracts.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Future<void> main() async {
5858
final client = Web3Client(rpcUrl, Client(), socketConnector: () {
5959
return IOWebSocketChannel.connect(wsUrl).cast<String>();
6060
});
61-
final credentials = await client.credentialsFromPrivateKey(privateKey);
61+
final credentials = EthPrivateKey.fromHex(privateKey);
6262
final ownAddress = await credentials.extractAddress();
6363

6464
// read the contract abi and tell web3dart where it's deployed (contractAddr)

example/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Future<void> main() async {
99
// start a client we can use to send transactions
1010
final client = Web3Client(rpcUrl, Client());
1111

12-
final credentials = await client.credentialsFromPrivateKey(privateKey);
12+
final credentials = EthPrivateKey.fromHex(privateKey);
1313
final address = credentials.address;
1414

1515
print(address.hexEip55);

lib/src/builder/generator.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'dart:async';
22
import 'dart:convert';
33

4+
import 'package:build/build.dart';
45
import 'package:built_collection/built_collection.dart';
56
import 'package:code_builder/code_builder.dart';
6-
import 'package:build/build.dart';
77
import 'package:dart_style/dart_style.dart';
88
import 'package:path/path.dart';
99
import 'package:web3dart/contracts.dart';

lib/src/contracts/abi/arrays.dart

+6-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ class FixedBytes extends AbiType<Uint8List> {
3737
'Invalid length: Tried to encode ${data.length} bytes, but expected exactly $length');
3838
final paddingBytes = calculatePadLength(length);
3939

40-
buffer..add(data)..add(Uint8List(paddingBytes));
40+
buffer
41+
..add(data)
42+
..add(Uint8List(paddingBytes));
4143
}
4244

4345
@override
@@ -87,7 +89,9 @@ class DynamicBytes extends AbiType<Uint8List> {
8789

8890
final padding = calculatePadLength(data.length, allowEmpty: true);
8991

90-
buffer..add(data)..add(Uint8List(padding));
92+
buffer
93+
..add(data)
94+
..add(Uint8List(padding));
9195
}
9296

9397
@override

lib/src/contracts/abi/integers.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ class AddressType extends AbiType<EthereumAddress> {
107107

108108
@override
109109
void encode(EthereumAddress data, LengthTrackingByteSink buffer) {
110-
buffer..add(Uint8List(_paddingLen))..add(data.addressBytes);
110+
buffer
111+
..add(Uint8List(_paddingLen))
112+
..add(data.addressBytes);
111113
}
112114

113115
@override

lib/src/core/client.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ class Web3Client {
7272

7373
final socket = socketConnector!();
7474
_streamRpcPeer = rpc.Peer(socket)
75-
..registerMethod('eth_subscription', (rpc.Parameters params) {
76-
_filters.handlePubSubNotification(params);
77-
});
75+
..registerMethod('eth_subscription', _filters.handlePubSubNotification);
7876

7977
_streamRpcPeer?.listen().then((_) {
8078
// .listen() will complete when the socket is closed, so reset client

lib/src/core/transaction_signer.dart

+7-2
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,15 @@ List<dynamic> _encodeToRlp(Transaction transaction, MsgSignature? signature) {
100100
list.add('');
101101
}
102102

103-
list..add(transaction.value?.getInWei)..add(transaction.data);
103+
list
104+
..add(transaction.value?.getInWei)
105+
..add(transaction.data);
104106

105107
if (signature != null) {
106-
list..add(signature.v)..add(signature.r)..add(signature.s);
108+
list
109+
..add(signature.v)
110+
..add(signature.r)
111+
..add(signature.s);
107112
}
108113

109114
return list;

lib/src/credentials/wallet.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@ import 'package:pointycastle/api.dart';
77
import 'package:pointycastle/block/aes_fast.dart';
88
import 'package:pointycastle/digests/sha256.dart';
99
import 'package:pointycastle/key_derivators/api.dart';
10-
import 'package:pointycastle/macs/hmac.dart';
1110
import 'package:pointycastle/key_derivators/pbkdf2.dart' as pbkdf2;
1211
import 'package:pointycastle/key_derivators/scrypt.dart' as scrypt;
12+
import 'package:pointycastle/macs/hmac.dart';
1313
import 'package:pointycastle/stream/ctr.dart';
1414

1515
import '../crypto/formatting.dart';
1616
import '../crypto/keccak.dart';
1717
import '../crypto/random_bridge.dart';
1818
import '../utils/typed_data.dart';
1919
import '../utils/uuid.dart';
20-
2120
import 'credentials.dart';
2221

2322
abstract class _KeyDerivator {

test/contracts/abi/event_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:test/test.dart';
2-
import 'package:web3dart/crypto.dart';
3-
import 'package:web3dart/credentials.dart';
42
import 'package:web3dart/contracts.dart';
3+
import 'package:web3dart/credentials.dart';
4+
import 'package:web3dart/crypto.dart';
55

66
void main() {
77
final event = ContractEvent(false, 'Transfer', const [

test/core/sign_transaction_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:web3dart/web3dart.dart';
2-
import 'package:web3dart/crypto.dart';
31
import 'package:http/http.dart';
42
import 'package:test/test.dart';
3+
import 'package:web3dart/crypto.dart';
4+
import 'package:web3dart/web3dart.dart';
55

66
void main() {
77
test('signs transactions', () async {

test/credentials/address_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:web3dart/credentials.dart';
21
import 'package:test/test.dart';
2+
import 'package:web3dart/credentials.dart';
33

44
// https://eips.ethereum.org/EIPS/eip-55#test-cases
55
const _lowerCaseToEip55 = {

test/credentials/private_key_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'dart:convert';
22

3+
import 'package:test/test.dart';
34
import 'package:web3dart/credentials.dart';
45
import 'package:web3dart/crypto.dart';
5-
import 'package:test/test.dart';
66

77
void main() {
88
test('signs messages', () async {

test/credentials/public_key_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:web3dart/crypto.dart';
21
import 'package:test/test.dart';
2+
import 'package:web3dart/crypto.dart';
33

44
final pubKeys = {
55
'038e5d1fccb6b800b4e0fde5080a8c3628a302c4767e7687bea79ba24c6ac268e2':

test/utils/rlp_test.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import 'dart:convert';
2+
3+
import 'package:test/test.dart';
24
import 'package:web3dart/crypto.dart';
35
import 'package:web3dart/src/utils/rlp.dart';
4-
import 'package:test/test.dart';
56

67
import 'rlp_test_vectors.dart' as data;
78

0 commit comments

Comments
 (0)